Security-59754.80.3.tar.gz

[apple/security.git] / Security.xcodeproj / project.pbxproj

diff --git a/Security.xcodeproj/project.pbxproj b/Security.xcodeproj/project.pbxproj
index f7e1cec6c6b5d32a720f00d9bbc3a11f72404973..6ff0fdc5db7541f93f7a795fe4881bb98fbff23f 100644 (file)
--- a/Security.xcodeproj/project.pbxproj
+++ b/Security.xcodeproj/project.pbxproj
@@ -3,92 +3,36 @@
        archiveVersion = 1;
        classes = {
        };
        archiveVersion = 1;
        classes = {
        };

-       objectVersion = 46;
+       objectVersion = 52;

        objects = {
 
 /* Begin PBXAggregateTarget section */
        objects = {
 
 /* Begin PBXAggregateTarget section */

-               05EF68AF1949149C007958C3 /* Security_temporary_UI */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = 05EF68B01949149C007958C3 /* Build configuration list for PBXAggregateTarget "Security_temporary_UI" */;
-                       buildPhases = (
-                       );
-                       dependencies = (
-                               DCE4E9731D7F3FC200AFB96E /* PBXTargetDependency */,
-                               DCE4E90C1D7F3B4A00AFB96E /* PBXTargetDependency */,
-                       );
-                       name = Security_temporary_UI;
-                       productName = Security_temporary_UI;
-               };
-               05EF68B519491512007958C3 /* Security_frameworks */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = 05EF68B619491512007958C3 /* Build configuration list for PBXAggregateTarget "Security_frameworks" */;
-                       buildPhases = (
-                       );
-                       dependencies = (
-                               E79EEDDF1CD3FFEA00C2FBFC /* PBXTargetDependency */,
-                       );
-                       name = Security_frameworks;
-                       productName = Security_framework;
-               };

                05EF68BB194915A5007958C3 /* Security_executables_osx */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 05EF68BC194915A5007958C3 /* Build configuration list for PBXAggregateTarget "Security_executables_osx" */;
                        buildPhases = (
                        );
                        dependencies = (
                05EF68BB194915A5007958C3 /* Security_executables_osx */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 05EF68BC194915A5007958C3 /* Build configuration list for PBXAggregateTarget "Security_executables_osx" */;
                        buildPhases = (
                        );
                        dependencies = (

+                               6C2045F82424BC4400F9461D /* PBXTargetDependency */,

                                47C2F1902059CBFC0062DE30 /* PBXTargetDependency */,
                                47C2F1902059CBFC0062DE30 /* PBXTargetDependency */,

+                               DCE27861245B81BD00381FE8 /* PBXTargetDependency */,
+                               D469C4E5218BECCE008AC1FC /* PBXTargetDependency */,

                                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */,
                                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */,

-                               F621D0831ED6ED5B000EA569 /* PBXTargetDependency */,
-                               6C24EF4A1E415109000DE79F /* PBXTargetDependency */,

                                EB27FF261E40716D00EC9E3A /* PBXTargetDependency */,
                                EBF374821DC058B60065D840 /* PBXTargetDependency */,
                                EB27FF261E40716D00EC9E3A /* PBXTargetDependency */,
                                EBF374821DC058B60065D840 /* PBXTargetDependency */,

-                               DCE4E7B81D7A456500AFB96E /* PBXTargetDependency */,
-                               DC61096D1D78E72C002223DE /* PBXTargetDependency */,
-                               DC610A421D78F3A5002223DE /* PBXTargetDependency */,

                                DC5ABE1C1D832F5E00CF422C /* PBXTargetDependency */,
                                DC5ABE1C1D832F5E00CF422C /* PBXTargetDependency */,

-                               DCE4E6AA1D7A38E700AFB96E /* PBXTargetDependency */,
-                               DCE4E7F11D7A4BEC00AFB96E /* PBXTargetDependency */,
-                               DC610A381D78F15C002223DE /* PBXTargetDependency */,
-                               DC5AC12F1D8356DA00CF422C /* PBXTargetDependency */,
-                               DCE4E82A1D7A4F2500AFB96E /* PBXTargetDependency */,
-                               DCE4E8621D7A58BA00AFB96E /* PBXTargetDependency */,

                                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */,
                                DC3A4B6B1D91EBEE00E46D4A /* PBXTargetDependency */,
                                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */,
                                DC3A4B6B1D91EBEE00E46D4A /* PBXTargetDependency */,

-                               DCBE6E4A1D91E23D00A3E5E5 /* PBXTargetDependency */,
-                               DC610ABC1D791139002223DE /* PBXTargetDependency */,
-                               DC610A6C1D78FAA2002223DE /* PBXTargetDependency */,
-                               DC610A541D78F759002223DE /* PBXTargetDependency */,
-                               DC61096B1D78E60C002223DE /* PBXTargetDependency */,
-                               EBD849361B242C8900C5FD1E /* PBXTargetDependency */,

                                E74583BE1BF66489001B54A4 /* PBXTargetDependency */,
                                EB31EA831D3EF2FB008F952A /* PBXTargetDependency */,
                                DA30D6821DF8C93500EC6B43 /* PBXTargetDependency */,
                                E74583BE1BF66489001B54A4 /* PBXTargetDependency */,
                                EB31EA831D3EF2FB008F952A /* PBXTargetDependency */,
                                DA30D6821DF8C93500EC6B43 /* PBXTargetDependency */,

-                               EBC15EA91BE29AC3001C0C5B /* PBXTargetDependency */,

                                EBD31B421E0A18A600FBE9FA /* PBXTargetDependency */,
                                EBD31B3B1E0A186500FBE9FA /* PBXTargetDependency */,
                                EBD31B421E0A18A600FBE9FA /* PBXTargetDependency */,
                                EBD31B3B1E0A186500FBE9FA /* PBXTargetDependency */,

-                               DCB515D91ED3CC6B001F1152 /* PBXTargetDependency */,
-                               6C24EF4A1E415109000DE79F /* PBXTargetDependency */,
-                               DCB515D71ED3CC52001F1152 /* PBXTargetDependency */,

                                6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */,
                                6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */,

-                               6CAA8CE91F82FD13007B6E03 /* PBXTargetDependency */,
-                               DC5225001E40295C0021640A /* PBXTargetDependency */,
-                               EB636BD320992DB400C1E21A /* PBXTargetDependency */,
-                               EB11965A20A6300600BFDA1B /* PBXTargetDependency */,
-                               6C7C38811FD88C4700DFFE68 /* PBXTargetDependency */,

                        );
                        name = Security_executables_osx;
                        productName = Security_executables;
                };
                        );
                        name = Security_executables_osx;
                        productName = Security_executables;
                };

-               05EF68C1194915FB007958C3 /* Security_kexts */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = 05EF68C2194915FB007958C3 /* Build configuration list for PBXAggregateTarget "Security_kexts" */;
-                       buildPhases = (
-                       );
-                       dependencies = (
-                       );
-                       name = Security_kexts;
-                       productName = Security_kexts;
-               };

                0C6799F912F7C37C00712919 /* dtlsTests */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 0C679A0412F7C3AE00712919 /* Build configuration list for PBXAggregateTarget "dtlsTests" */;
                0C6799F912F7C37C00712919 /* dtlsTests */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = 0C679A0412F7C3AE00712919 /* Build configuration list for PBXAggregateTarget "dtlsTests" */;


@@ -107,24 +51,24 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               DC71D9E31D95BAD50065FB93 /* PBXTargetDependency */,

                                EB6A6FBD1B90F9170045DC68 /* PBXTargetDependency */,
                                EB6A6FBD1B90F9170045DC68 /* PBXTargetDependency */,

-                               BE9C38CF1EB115C9007E2AE1 /* PBXTargetDependency */,
+                               DC647C46208A85C900D0F9F8 /* PBXTargetDependency */,
+                               D4F56BAB217FCAF600FCA6B7 /* PBXTargetDependency */,
+                               0C65BB4F23C3F3270063D2B7 /* PBXTargetDependency */,

                        );
                        name = Security_frameworks_ios;
                        productName = kernel;
                };
                        );
                        name = Security_frameworks_ios;
                        productName = kernel;
                };

-               4809F7A42061B697003E72D0 /* MultiPeerSimulatorTests */ = {
+               0CA378E123876DD100090B7E /* reset_account */ = {

                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;

-                       buildConfigurationList = 4809F7AC2061B697003E72D0 /* Build configuration list for PBXAggregateTarget "MultiPeerSimulatorTests" */;
+                       buildConfigurationList = 0CA378E323876DD100090B7E /* Build configuration list for PBXAggregateTarget "reset_account" */;

                        buildPhases = (
                        buildPhases = (

+                               0CA378E623876DEC00090B7E /* CopyFiles */,

                        );
                        dependencies = (
                        );
                        dependencies = (

-                               4809F7AE2061B6AA003E72D0 /* PBXTargetDependency */,
-                               4809F7B02061B6B0003E72D0 /* PBXTargetDependency */,

                        );
                        );

-                       name = MultiPeerSimulatorTests;
-                       productName = MultiPeerSimulatorTests;
+                       name = reset_account;
+                       productName = codesigning_DTrace;

                };
                4C541F840F250BF500E508AE /* Security_executables_ios */ = {
                        isa = PBXAggregateTarget;
                };
                4C541F840F250BF500E508AE /* Security_executables_ios */ = {
                        isa = PBXAggregateTarget;


@@ -132,69 +76,54 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               4771D982209A76B100BA9772 /* PBXTargetDependency */,
+                               5AAE383623D261CF0025CF9E /* PBXTargetDependency */,
+                               EB74CC232207E99700F1BBAD /* PBXTargetDependency */,

                                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */,
                                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */,

+                               4771D982209A76B100BA9772 /* PBXTargetDependency */,

                                0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */,
                                0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */,

-                               D41257F11E941E7D00781F23 /* PBXTargetDependency */,

                                EB27FF281E40717400EC9E3A /* PBXTargetDependency */,
                                EBF374841DC058C00065D840 /* PBXTargetDependency */,
                                EB27FF281E40717400EC9E3A /* PBXTargetDependency */,
                                EBF374841DC058C00065D840 /* PBXTargetDependency */,

-                               EBB696D41BE2085700715F16 /* PBXTargetDependency */,

                                438169E71B4EE4B300C54D58 /* PBXTargetDependency */,
                                438169E71B4EE4B300C54D58 /* PBXTargetDependency */,

-                               5EF7C2561B00EEF900E5E99C /* PBXTargetDependency */,
-                               5E10995419A5E80B00A60E2B /* PBXTargetDependency */,
-                               4C541F8C0F250C0400E508AE /* PBXTargetDependency */,
-                               4C541F8E0F250C0900E508AE /* PBXTargetDependency */,
-                               4C541F920F250C1300E508AE /* PBXTargetDependency */,
-                               4C541F900F250C0E00E508AE /* PBXTargetDependency */,
-                               4C9DE9EF1181ACA000CF5C27 /* PBXTargetDependency */,
-                               0C664AB41759270C0092D3D9 /* PBXTargetDependency */,
-                               0C99B740131C984900584CF4 /* PBXTargetDependency */,
-                               0CC827F2138712B100BD99B7 /* PBXTargetDependency */,

                                52D82BF616A627100078DFE5 /* PBXTargetDependency */,
                                52D82BF616A627100078DFE5 /* PBXTargetDependency */,

+                               DA41FE1D2241B64800838FB3 /* PBXTargetDependency */,

                                4C52D0EE16EFCD720079966E /* PBXTargetDependency */,
                                4C52D0EE16EFCD720079966E /* PBXTargetDependency */,

-                               BE197F631911742900BA91D1 /* PBXTargetDependency */,
-                               BE4AC9B418B8020400B84964 /* PBXTargetDependency */,

                                5346481B17331ED800FE9172 /* PBXTargetDependency */,
                                5346481B17331ED800FE9172 /* PBXTargetDependency */,

-                               F94E7AE21ACC8E7700F23132 /* PBXTargetDependency */,
-                               EB9C1DB71BDFD51800F89272 /* PBXTargetDependency */,
-                               DCB515DB1ED3CC73001F1152 /* PBXTargetDependency */,
-                               6C24EF531E415132000DE79F /* PBXTargetDependency */,
-                               DCB515D01ED3CC36001F1152 /* PBXTargetDependency */,
-                               DC5224F91E4029520021640A /* PBXTargetDependency */,
-                               EB0D30FA1EF12BFB00C3C17D /* PBXTargetDependency */,

                                6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */,
                                6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */,

-                               6CAA8CE51F82FD08007B6E03 /* PBXTargetDependency */,
-                               6C7C38881FD88C5A00DFFE68 /* PBXTargetDependency */,
-                               EB636BCA20992D8900C1E21A /* PBXTargetDependency */,
-                               EB11965C20A6301100BFDA1B /* PBXTargetDependency */,
+                               BE4AC9B418B8020400B84964 /* PBXTargetDependency */,
+                               BE197F631911742900BA91D1 /* PBXTargetDependency */,

                        );
                        name = Security_executables_ios;
                        productName = phase2;
                };
                        );
                        name = Security_executables_ios;
                        productName = phase2;
                };

-               4C541F950F250C3000E508AE /* phase1 */ = {
+               4C91273D0ADBF46200AF202E /* Security_all_ios */ = {

                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;

-                       buildConfigurationList = 4C541FA20F250C8C00E508AE /* Build configuration list for PBXAggregateTarget "phase1" */;
+                       buildConfigurationList = 4C91274A0ADBF4A100AF202E /* Build configuration list for PBXAggregateTarget "Security_all_ios" */;

                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               E79EEDD71CD3F9F800C2FBFC /* PBXTargetDependency */,
+                               EB6A6FBB1B90F8EC0045DC68 /* PBXTargetDependency */,
+                               D4F47B2D22270B23003483E9 /* PBXTargetDependency */,
+                               4C541FA10F250C5200E508AE /* PBXTargetDependency */,
+                               D4F47B3122270B38003483E9 /* PBXTargetDependency */,
+                               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */,
+                               DC647C4A208A865200D0F9F8 /* PBXTargetDependency */,

                        );
                        );

-                       name = phase1;
-                       productName = phase1;
+                       name = Security_all_ios;
+                       productName = world;

                };
                };

-               4C91273D0ADBF46200AF202E /* ios */ = {
+               BEAA0040202B728B00E51F45 /* Security_executables_Swift */ = {

                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;

-                       buildConfigurationList = 4C91274A0ADBF4A100AF202E /* Build configuration list for PBXAggregateTarget "ios" */;
+                       buildConfigurationList = BEAA0041202B728B00E51F45 /* Build configuration list for PBXAggregateTarget "Security_executables_Swift" */;

                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               EB6A6FBB1B90F8EC0045DC68 /* PBXTargetDependency */,
-                               4C541FA10F250C5200E508AE /* PBXTargetDependency */,
-                               E7CFF6771C84F66A00E3484E /* PBXTargetDependency */,
-                               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */,
+                               DCA232FC209A35840007B57D /* PBXTargetDependency */,
+                               DC0503612140848100A8EDB7 /* PBXTargetDependency */,
+                               DCC5D6682087EDB300BBC127 /* PBXTargetDependency */,
+                               DC27C3CD20EAFDF800F7839C /* PBXTargetDependency */,

                        );
                        );

-                       name = ios;
-                       productName = world;
+                       name = Security_executables_Swift;
+                       productName = Security_executables_Swift;

                };
                D41AD42D1B967169008C7270 /* Security_executables_watchos */ = {
                        isa = PBXAggregateTarget;
                };
                D41AD42D1B967169008C7270 /* Security_executables_watchos */ = {
                        isa = PBXAggregateTarget;


@@ -202,27 +131,15 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               EB8910FE20E06DF500DE533F /* PBXTargetDependency */,

                                47C2F1922059CC040062DE30 /* PBXTargetDependency */,
                                47C2F1922059CC040062DE30 /* PBXTargetDependency */,

-                               BE061EB91EE5EBA000B22118 /* PBXTargetDependency */,
-                               EBA62C1C1EAD34CD0096B33A /* PBXTargetDependency */,
-                               D41257F51E941E8E00781F23 /* PBXTargetDependency */,

                                EBF374881DC058CC0065D840 /* PBXTargetDependency */,
                                EBF374881DC058CC0065D840 /* PBXTargetDependency */,

-                               D41AD45C1B978A7A008C7270 /* PBXTargetDependency */,
-                               D41AD45E1B978A7C008C7270 /* PBXTargetDependency */,
-                               D41AD4601B978E18008C7270 /* PBXTargetDependency */,
-                               D41AD4621B978E24008C7270 /* PBXTargetDependency */,
-                               D41AD4661B978F19008C7270 /* PBXTargetDependency */,
-                               D41AD4681B978F20008C7270 /* PBXTargetDependency */,
-                               D41AD46A1B978F24008C7270 /* PBXTargetDependency */,
-                               D41AD46C1B978F28008C7270 /* PBXTargetDependency */,
-                               D41AD46E1B978F4C008C7270 /* PBXTargetDependency */,
-                               EB9FE0B61BFBC499004FEAAF /* PBXTargetDependency */,
-                               EB636BD520992DC000C1E21A /* PBXTargetDependency */,
-                               EB89FAFE20DBDAA800085498 /* PBXTargetDependency */,
-                               EB89FB0020DBDAA800085498 /* PBXTargetDependency */,
-                               EB89FB0220DBDAA800085498 /* PBXTargetDependency */,
-                               EB8910F820E0287E00DE533F /* PBXTargetDependency */,
+                               87EDC39E2141BB8A007B0E64 /* PBXTargetDependency */,
+                               87EDC3A22141BB92007B0E64 /* PBXTargetDependency */,
+                               87EDC3A42141BB9B007B0E64 /* PBXTargetDependency */,
+                               87EDC3A82141BBAA007B0E64 /* PBXTargetDependency */,
+                               DA41FE1F2241B65A00838FB3 /* PBXTargetDependency */,
+                               87EDC3B22141BBD5007B0E64 /* PBXTargetDependency */,
+                               D456A06B22AF1874001119F3 /* PBXTargetDependency */,

                        );
                        name = Security_executables_watchos;
                        productName = Security_executables_watchos;
                        );
                        name = Security_executables_watchos;
                        productName = Security_executables_watchos;


@@ -233,35 +150,310 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               47C2F18E2059CBF40062DE30 /* PBXTargetDependency */,
-                               BE061EB71EE5EB9000B22118 /* PBXTargetDependency */,
-                               EBA62C151EAD34C60096B33A /* PBXTargetDependency */,
-                               D41257F31E941E8600781F23 /* PBXTargetDependency */,
+                               EB2ED4E922547DE900E98082 /* PBXTargetDependency */,
+                               DC391FA321C03F8D00772585 /* PBXTargetDependency */,
+                               0CF09210219649DB002B0AEE /* PBXTargetDependency */,

                                EBF374861DC058C50065D840 /* PBXTargetDependency */,
                                EBF374861DC058C50065D840 /* PBXTargetDependency */,

-                               D41AD43A1B96721E008C7270 /* PBXTargetDependency */,

                                D41AD4521B9788B2008C7270 /* PBXTargetDependency */,
                                D41AD4521B9788B2008C7270 /* PBXTargetDependency */,

-                               D41AD4461B9786A3008C7270 /* PBXTargetDependency */,
-                               D41AD43E1B967242008C7270 /* PBXTargetDependency */,
-                               D41AD43C1B96723B008C7270 /* PBXTargetDependency */,
-                               D41AD44C1B9786E2008C7270 /* PBXTargetDependency */,
-                               D41AD4401B96724C008C7270 /* PBXTargetDependency */,
-                               D41AD4441B978681008C7270 /* PBXTargetDependency */,
-                               D41AD4421B97866C008C7270 /* PBXTargetDependency */,
-                               D419C0261E57EACA008619D1 /* PBXTargetDependency */,
-                               D41AD44E1B978791008C7270 /* PBXTargetDependency */,
-                               D41AD44A1B9786D8008C7270 /* PBXTargetDependency */,
-                               EB9FE08D1BFBC48F004FEAAF /* PBXTargetDependency */,
-                               EB636BD120992DA300C1E21A /* PBXTargetDependency */,
-                               EBC73F52209A705A00AE3350 /* PBXTargetDependency */,
-                               EB11965E20A6302100BFDA1B /* PBXTargetDependency */,
-                               EBC73F5D209A739600AE3350 /* PBXTargetDependency */,
-                               EBC73F64209A73A100AE3350 /* PBXTargetDependency */,
-                               EBC73F66209A73A100AE3350 /* PBXTargetDependency */,
-                               EB8910F120E0287600DE533F /* PBXTargetDependency */,
+                               47C2F18E2059CBF40062DE30 /* PBXTargetDependency */,
+                               D456A06822AF1866001119F3 /* PBXTargetDependency */,

                        );
                        name = Security_executables_tvos;
                        productName = Security_executables_tvos;
                };
                        );
                        name = Security_executables_tvos;
                        productName = Security_executables_tvos;
                };

+               D477EE5C21ED476D00C9AAFF /* Security_tests_bridge */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D477EE5D21ED476D00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_bridge" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4EB53BE223C3D2B009101F8 /* PBXTargetDependency */,
+                               D4EB53B9223C3CE3009101F8 /* PBXTargetDependency */,
+                               D4EB53BB223C3CE3009101F8 /* PBXTargetDependency */,
+                               6C4AA1AA2228B640006FA945 /* PBXTargetDependency */,
+                       );
+                       name = Security_tests_bridge;
+                       productName = Security_tests_bridge;
+               };
+               D477EE6021ED477B00C9AAFF /* Security_tests_tvos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D477EE6121ED477C00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_tvos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               0CCC22D223F39A7500E1FCD0 /* PBXTargetDependency */,
+                               6CF33CA62387156600D1E75D /* PBXTargetDependency */,
+                               EB694E87223AB79400F02C1C /* PBXTargetDependency */,
+                               D4E0E9702224DE8200A802E0 /* PBXTargetDependency */,
+                               D4E0E9722224DE8200A802E0 /* PBXTargetDependency */,
+                               D4E0E9742224DE8200A802E0 /* PBXTargetDependency */,
+                               D4E0E96E2224DE7A00A802E0 /* PBXTargetDependency */,
+                               D4E0E96C2224DE7000A802E0 /* PBXTargetDependency */,
+                               D4E0E96A2224DE6800A802E0 /* PBXTargetDependency */,
+                               D4E0E9682224DE5700A802E0 /* PBXTargetDependency */,
+                               D4E0E9662224DE5100A802E0 /* PBXTargetDependency */,
+                               D4E0E9642224DE4900A802E0 /* PBXTargetDependency */,
+                               D4E0E9622224DE3D00A802E0 /* PBXTargetDependency */,
+                               D4E0E9602224DE2700A802E0 /* PBXTargetDependency */,
+                               D4E0E95E2224DE1A00A802E0 /* PBXTargetDependency */,
+                               D4E0E95C2224DE1000A802E0 /* PBXTargetDependency */,
+                               D4E0E9582224DDFE00A802E0 /* PBXTargetDependency */,
+                               D4E0E95A2224DDFE00A802E0 /* PBXTargetDependency */,
+                               D4E0E9562224DDF000A802E0 /* PBXTargetDependency */,
+                               D4E0E9542224DDEA00A802E0 /* PBXTargetDependency */,
+                               D4E0E9512224DDE300A802E0 /* PBXTargetDependency */,
+                               EBB8521622F793CF00424FD0 /* PBXTargetDependency */,
+                       );
+                       name = Security_tests_tvos;
+                       productName = Security_tests_tvos;
+               };
+               D477EE6421ED479500C9AAFF /* Security_tests_watchos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D477EE6521ED479500C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_watchos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               0CCC22D423F39A7C00E1FCD0 /* PBXTargetDependency */,
+                               6CF33CA82387157200D1E75D /* PBXTargetDependency */,
+                               EB694E72223AB78E00F02C1C /* PBXTargetDependency */,
+                               D4E0E9A62224DFDD00A802E0 /* PBXTargetDependency */,
+                               D4E0E9A82224DFDD00A802E0 /* PBXTargetDependency */,
+                               D4E0E9AA2224DFDD00A802E0 /* PBXTargetDependency */,
+                               D4E0E9A42224DFD500A802E0 /* PBXTargetDependency */,
+                               D4E0E9A22224DFCB00A802E0 /* PBXTargetDependency */,
+                               D4E0E9A02224DFC500A802E0 /* PBXTargetDependency */,
+                               D4E0E99E2224DFBA00A802E0 /* PBXTargetDependency */,
+                               D4E0E99C2224DFB500A802E0 /* PBXTargetDependency */,
+                               D4E0E99A2224DFAD00A802E0 /* PBXTargetDependency */,
+                               D4E0E9982224DF9A00A802E0 /* PBXTargetDependency */,
+                               D4E0E9962224DF9300A802E0 /* PBXTargetDependency */,
+                               D4E0E9942224DF8D00A802E0 /* PBXTargetDependency */,
+                               D4E0E95C2224DE1000A802E0 /* PBXTargetDependency */,
+                               D4E0E9902224DF8500A802E0 /* PBXTargetDependency */,
+                               D4E0E9922224DF8500A802E0 /* PBXTargetDependency */,
+                               D4E0E98E2224DF7D00A802E0 /* PBXTargetDependency */,
+                               D4E0E98C2224DF7700A802E0 /* PBXTargetDependency */,
+                               D4E0E98A2224DF6F00A802E0 /* PBXTargetDependency */,
+                               EBB8521822F793EF00424FD0 /* PBXTargetDependency */,
+                       );
+                       name = Security_tests_watchos;
+                       productName = Security_tests_watchos;
+               };
+               D477EE6821ED47C500C9AAFF /* Security_executables_darwinos_only_osx */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D477EE6921ED47C600C9AAFF /* Build configuration list for PBXAggregateTarget "Security_executables_darwinos_only_osx" */;
+                       buildPhases = (
+                               EB15CA26223C60B9002BF362 /* ShellScript */,
+                       );
+                       dependencies = (
+                       );
+                       name = Security_executables_darwinos_only_osx;
+                       productName = Security_executables_darwinos_only_osx;
+               };
+               D477EE6C21ED47DA00C9AAFF /* Security_executables_darwinos_only_ios */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D477EE6D21ED47DB00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_executables_darwinos_only_ios" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               EB6952BB223B75FC00F02C1C /* PBXTargetDependency */,
+                               EB8908A221F17E3B00F0DDDB /* PBXTargetDependency */,
+                       );
+                       name = Security_executables_darwinos_only_ios;
+                       productName = Security_executables_darwinos_only_ios;
+               };
+               D4D1D3FC21AD0B3F0012C66C /* Security_executables_core_watchos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4D1D3FE21AD0B3F0012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_watchos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4E0E9882224DF5800A802E0 /* PBXTargetDependency */,
+                               D4E0E9862224DF4E00A802E0 /* PBXTargetDependency */,
+                       );
+                       name = Security_executables_core_watchos;
+                       productName = Security_executables_core;
+               };
+               D4D1D40121AD0B4B0012C66C /* Security_executables_core_tvos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4D1D40321AD0B4B0012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_tvos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D45D8F9A2224DD8200D6C124 /* PBXTargetDependency */,
+                               D45D8F982224DD7B00D6C124 /* PBXTargetDependency */,
+                       );
+                       name = Security_executables_core_tvos;
+                       productName = Security_executables_core;
+               };
+               D4D1D40821ADC9720012C66C /* Security_executables_core_osx */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4D1D40A21ADC9720012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_osx" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4A763E52224BE170063B2B9 /* PBXTargetDependency */,
+                               D4A763D12224BCDE0063B2B9 /* PBXTargetDependency */,
+                               D4A763CF2224BCD10063B2B9 /* PBXTargetDependency */,
+                       );
+                       name = Security_executables_core_osx;
+                       productName = Security_executables_core;
+               };
+               D4F47B3822270B6E003483E9 /* Security_all_watchos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F47B3922270B6F003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_watchos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4F47B4522270BB6003483E9 /* PBXTargetDependency */,
+                               D4F47B4722270BB6003483E9 /* PBXTargetDependency */,
+                               D4F47B4922270BB6003483E9 /* PBXTargetDependency */,
+                               D4F47B4B22270BB6003483E9 /* PBXTargetDependency */,
+                               D4F47B4D22270BB6003483E9 /* PBXTargetDependency */,
+                               D4F47B4F22270BC0003483E9 /* PBXTargetDependency */,
+                       );
+                       name = Security_all_watchos;
+                       productName = Security_all_watchos;
+               };
+               D4F47B3C22270B89003483E9 /* Security_all_tvos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F47B3D22270B8A003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_tvos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4F47B5122270BD9003483E9 /* PBXTargetDependency */,
+                               D4F47B5322270BD9003483E9 /* PBXTargetDependency */,
+                               D4F47B5522270BD9003483E9 /* PBXTargetDependency */,
+                               D4F47B5722270BD9003483E9 /* PBXTargetDependency */,
+                               D4F47B5922270BD9003483E9 /* PBXTargetDependency */,
+                               D4F47B5B22270BDE003483E9 /* PBXTargetDependency */,
+                       );
+                       name = Security_all_tvos;
+                       productName = Security_all_tvos;
+               };
+               D4F47B4022270B97003483E9 /* Security_all_bridge */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F47B4122270B97003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_bridge" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4F47B5D22270BEB003483E9 /* PBXTargetDependency */,
+                               D4F47B5F22270BEB003483E9 /* PBXTargetDependency */,
+                               D4F47B6122270BEB003483E9 /* PBXTargetDependency */,
+                       );
+                       name = Security_all_bridge;
+                       productName = Security_all_bridge;
+               };
+               D4F56B86217FA32000FCA6B7 /* Security_executables_core_ios */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56B8B217FA32000FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_executables_core_ios" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D45D8F702224DB6D00D6C124 /* PBXTargetDependency */,
+                               D45D8F6E2224DB6400D6C124 /* PBXTargetDependency */,
+                       );
+                       name = Security_executables_core_ios;
+                       productName = Security_executables_core;
+               };
+               D4F56B8D217FA3F800FCA6B7 /* Security_frameworks_tvos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56B8E217FA3F800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_frameworks_tvos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4F56B9D217FCA7E00FCA6B7 /* PBXTargetDependency */,
+                               D4F56B9F217FCA8600FCA6B7 /* PBXTargetDependency */,
+                               D4F56BB72181380600FCA6B7 /* PBXTargetDependency */,
+                               0C2B36C523C42EC800000718 /* PBXTargetDependency */,
+                       );
+                       name = Security_frameworks_tvos;
+                       productName = Security_frameworks_tvos;
+               };
+               D4F56B91217FA40800FCA6B7 /* Security_frameworks_watchos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56B92217FA40800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_frameworks_watchos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D4F56BA7217FCAB000FCA6B7 /* PBXTargetDependency */,
+                               D4F56BA5217FCAAA00FCA6B7 /* PBXTargetDependency */,
+                               D4F56BBB2181387600FCA6B7 /* PBXTargetDependency */,
+                               0C2B36C323C42EBC00000718 /* PBXTargetDependency */,
+                       );
+                       name = Security_frameworks_watchos;
+                       productName = Security_frameworks_watchos;
+               };
+               D4F56BC221813EC900FCA6B7 /* Security_internal_osx */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56BC321813EC900FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_osx" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               0CA378EB23876E1000090B7E /* PBXTargetDependency */,
+                               D4E0E9BC2224E15500A802E0 /* PBXTargetDependency */,
+                               D45D8F5C2224D9F100D6C124 /* PBXTargetDependency */,
+                               D45D8F5A2224D8A100D6C124 /* PBXTargetDependency */,
+                               D45D8F582224D88F00D6C124 /* PBXTargetDependency */,
+                               D45D8F562224D87C00D6C124 /* PBXTargetDependency */,
+                               D45D8F542224D7C400D6C124 /* PBXTargetDependency */,
+                               D45D8F522224D76E00D6C124 /* PBXTargetDependency */,
+                               D45D8F4F2224D72C00D6C124 /* PBXTargetDependency */,
+                       );
+                       name = Security_internal_osx;
+                       productName = Security_internal_osx;
+               };
+               D4F56BC621813ECF00FCA6B7 /* Security_internal_ios */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56BC721813ECF00FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_ios" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               0CA378E923876E0900090B7E /* PBXTargetDependency */,
+                               D4EB53C9223C4AB5009101F8 /* PBXTargetDependency */,
+                               D4E0E9BE2224E15E00A802E0 /* PBXTargetDependency */,
+                               D45D8F902224DC9900D6C124 /* PBXTargetDependency */,
+                               D45D8F8E2224DC8E00D6C124 /* PBXTargetDependency */,
+                               D45D8F922224DCCB00D6C124 /* PBXTargetDependency */,
+                               D45D8F942224DCD700D6C124 /* PBXTargetDependency */,
+                               D45D8F8C2224DC7600D6C124 /* PBXTargetDependency */,
+                       );
+                       name = Security_internal_ios;
+                       productName = Security_internal_osx;
+               };
+               D4F56BCA21813EDC00FCA6B7 /* Security_internal_tvos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56BCB21813EDC00FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_tvos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D476BC3922BD34280098E15A /* PBXTargetDependency */,
+                               D4EB53CB223C4ABE009101F8 /* PBXTargetDependency */,
+                               D4E0E9C02224E16A00A802E0 /* PBXTargetDependency */,
+                               D4E0E97E2224DF0B00A802E0 /* PBXTargetDependency */,
+                               D4E0E9802224DF0B00A802E0 /* PBXTargetDependency */,
+                               D4E0E9822224DF0B00A802E0 /* PBXTargetDependency */,
+                               D4E0E97C2224DF0300A802E0 /* PBXTargetDependency */,
+                       );
+                       name = Security_internal_tvos;
+                       productName = Security_internal_osx;
+               };
+               D4F56BCE21813EE800FCA6B7 /* Security_internal_watchos */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = D4F56BCF21813EE800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_watchos" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               D476BC3C22BD34320098E15A /* PBXTargetDependency */,
+                               D4E0E9C22224E17300A802E0 /* PBXTargetDependency */,
+                               D4E0E9B02224E00F00A802E0 /* PBXTargetDependency */,
+                               D4E0E9B22224E00F00A802E0 /* PBXTargetDependency */,
+                               D4E0E9B42224E00F00A802E0 /* PBXTargetDependency */,
+                               D4E0E9AE2224E00600A802E0 /* PBXTargetDependency */,
+                       );
+                       name = Security_internal_watchos;
+                       productName = Security_internal_osx;
+               };

                DC008B451D90CE53004002A3 /* securityd_macos_mig */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = DC008B561D90CE53004002A3 /* Build configuration list for PBXAggregateTarget "securityd_macos_mig" */;
                DC008B451D90CE53004002A3 /* securityd_macos_mig */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = DC008B561D90CE53004002A3 /* Build configuration list for PBXAggregateTarget "securityd_macos_mig" */;


@@ -317,6 +509,17 @@
                        name = security_cssm_generator;
                        productName = securityd_macos_mig_nomake;
                };
                        name = security_cssm_generator;
                        productName = securityd_macos_mig_nomake;
                };

+               DC6D1C70208A547400AB21AF /* Security_frameworks_bridge */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = DC6D1C75208A547400AB21AF /* Build configuration list for PBXAggregateTarget "Security_frameworks_bridge" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               DC6D1C73208A547400AB21AF /* PBXTargetDependency */,
+                       );
+                       name = Security_frameworks_bridge;
+                       productName = kernel;
+               };

                DC82FFE51D90D3F60085674B /* security_utilities_DTrace */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = DC82FFE71D90D3F60085674B /* Build configuration list for PBXAggregateTarget "security_utilities_DTrace" */;
                DC82FFE51D90D3F60085674B /* security_utilities_DTrace */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = DC82FFE71D90D3F60085674B /* Build configuration list for PBXAggregateTarget "security_utilities_DTrace" */;


@@ -391,20 +594,33 @@
                        name = "All Codesigning";
                        productName = "All Codesigning";
                };
                        name = "All Codesigning";
                        productName = "All Codesigning";
                };

-               E74584661BF68EBA001B54A4 /* osx */ = {
+               DCDA5E4F2124B9C5009B11B2 /* aks_support */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = DCDA5E542124B9C6009B11B2 /* Build configuration list for PBXAggregateTarget "aks_support" */;
+                       buildPhases = (
+                       );
+                       dependencies = (
+                               DC3E18E82125F9EF00073D80 /* PBXTargetDependency */,
+                               DCDA5E582124B9DC009B11B2 /* PBXTargetDependency */,
+                       );
+                       name = aks_support;
+                       productName = aks_support;
+               };
+               E74584661BF68EBA001B54A4 /* Security_all_osx */ = {

                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;

-                       buildConfigurationList = E74584671BF68EBA001B54A4 /* Build configuration list for PBXAggregateTarget "osx" */;
+                       buildConfigurationList = E74584671BF68EBA001B54A4 /* Build configuration list for PBXAggregateTarget "Security_all_osx" */;

                        buildPhases = (
                        );
                        dependencies = (
                                E79EEDE71CD4003900C2FBFC /* PBXTargetDependency */,
                        buildPhases = (
                        );
                        dependencies = (
                                E79EEDE71CD4003900C2FBFC /* PBXTargetDependency */,

-                               E7CFF6751C84F65D00E3484E /* PBXTargetDependency */,
+                               D4F47B3322270B4E003483E9 /* PBXTargetDependency */,

                                E745846D1BF68ECB001B54A4 /* PBXTargetDependency */,
                                E745846D1BF68ECB001B54A4 /* PBXTargetDependency */,

-                               E74584711BF68ECB001B54A4 /* PBXTargetDependency */,
-                               E745846F1BF68ECB001B54A4 /* PBXTargetDependency */,
+                               D4F47B3722270B5D003483E9 /* PBXTargetDependency */,

                                EB58A05C1E74C517009C10D7 /* PBXTargetDependency */,
                                EB58A05C1E74C517009C10D7 /* PBXTargetDependency */,

+                               DC647C48208A864800D0F9F8 /* PBXTargetDependency */,
+                               DCC5D66A2087EEE200BBC127 /* PBXTargetDependency */,

                        );
                        );

-                       name = osx;
+                       name = Security_all_osx;

                        productName = macosx;
                };
                E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */ = {
                        productName = macosx;
                };
                E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */ = {


@@ -413,17 +629,43 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               EBFF18CE1F02BA66004E58FC /* PBXTargetDependency */,
-                               BE061EAC1EE5EA5600B22118 /* PBXTargetDependency */,
-                               F667EC671E96FA4600203D5C /* PBXTargetDependency */,
-                               EB1C4CA71E85883900404981 /* PBXTargetDependency */,
-                               EB1C4CA91E85883900404981 /* PBXTargetDependency */,
-                               EB1C4CAB1E85883900404981 /* PBXTargetDependency */,
-                               EB58A0601E74C8D9009C10D7 /* PBXTargetDependency */,
-                               EB10557F1E14DFBE0003C309 /* PBXTargetDependency */,
-                               BE9C38D11EB115F4007E2AE1 /* PBXTargetDependency */,
-                               DCDB29761FD8839F00B5D242 /* PBXTargetDependency */,
-                               47D991D720407F890078CAE2 /* PBXTargetDependency */,
+                               3E4D531F2531185D00B124B3 /* PBXTargetDependency */,
+                               0CCC22D023F39A6A00E1FCD0 /* PBXTargetDependency */,
+                               6CC638FE2266AE0A00E5DB0B /* PBXTargetDependency */,
+                               6CC639002266AE0A00E5DB0B /* PBXTargetDependency */,
+                               EB694E8B223AB7A200F02C1C /* PBXTargetDependency */,
+                               EB694DD0223A087700F02C1C /* PBXTargetDependency */,
+                               EB694DC82239E5F200F02C1C /* PBXTargetDependency */,
+                               EB694DAF2239E59600F02C1C /* PBXTargetDependency */,
+                               D4BFFD6722275A4B00163B4B /* PBXTargetDependency */,
+                               D45D8F5E2224DA1000D6C124 /* PBXTargetDependency */,
+                               D4A763F72224BE980063B2B9 /* PBXTargetDependency */,
+                               D4A763F52224BE8A0063B2B9 /* PBXTargetDependency */,
+                               D4A763F32224BE810063B2B9 /* PBXTargetDependency */,
+                               D4A763EF2224BE6E0063B2B9 /* PBXTargetDependency */,
+                               D4A763F12224BE6E0063B2B9 /* PBXTargetDependency */,
+                               D4A763ED2224BE630063B2B9 /* PBXTargetDependency */,
+                               D4A763EB2224BE580063B2B9 /* PBXTargetDependency */,
+                               D4A763E92224BE430063B2B9 /* PBXTargetDependency */,
+                               D4A763E72224BE2F0063B2B9 /* PBXTargetDependency */,
+                               D4A763E32224BDF90063B2B9 /* PBXTargetDependency */,
+                               D4A763E12224BDED0063B2B9 /* PBXTargetDependency */,
+                               D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */,
+                               D4A763D92224BD990063B2B9 /* PBXTargetDependency */,
+                               D4A763D52224BD6F0063B2B9 /* PBXTargetDependency */,
+                               D4A763D32224BD640063B2B9 /* PBXTargetDependency */,
+                               D477EE7121ED48A500C9AAFF /* PBXTargetDependency */,
+                               D477EE7321ED48AA00C9AAFF /* PBXTargetDependency */,
+                               D477EE7521ED48B400C9AAFF /* PBXTargetDependency */,
+                               D477EE7721ED48C000C9AAFF /* PBXTargetDependency */,
+                               D477EE7921ED48C000C9AAFF /* PBXTargetDependency */,
+                               D477EE7B21ED48C000C9AAFF /* PBXTargetDependency */,
+                               D477EE7D21ED48CB00C9AAFF /* PBXTargetDependency */,
+                               D477EE7F21ED48D500C9AAFF /* PBXTargetDependency */,
+                               D477EE8121ED48DF00C9AAFF /* PBXTargetDependency */,
+                               EBB8521022F793A200424FD0 /* PBXTargetDependency */,
+                               6C61D3E8242A29BA008AB9BB /* PBXTargetDependency */,
+                               3E88361D24F08F5400E9F4D6 /* PBXTargetDependency */,

                        );
                        name = Security_tests_osx;
                        productName = Security_test_macos;
                        );
                        name = Security_tests_osx;
                        productName = Security_test_macos;


@@ -434,6 +676,27 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

+                               0CCC22CE23F39A6300E1FCD0 /* PBXTargetDependency */,
+                               6C2D797522C06CEF00C3CE32 /* PBXTargetDependency */,
+                               6C2D797322C06CEB00C3CE32 /* PBXTargetDependency */,
+                               EB694E89223AB79B00F02C1C /* PBXTargetDependency */,
+                               EB694DCE223A086C00F02C1C /* PBXTargetDependency */,
+                               EB694DC42239E5A200F02C1C /* PBXTargetDependency */,
+                               D45D8F882224DC3F00D6C124 /* PBXTargetDependency */,
+                               D45D8F862224DBF800D6C124 /* PBXTargetDependency */,
+                               D45D8F822224DBE300D6C124 /* PBXTargetDependency */,
+                               D45D8F7E2224DBD900D6C124 /* PBXTargetDependency */,
+                               D45D8F7C2224DBC600D6C124 /* PBXTargetDependency */,
+                               D45D8F7A2224DBBD00D6C124 /* PBXTargetDependency */,
+                               D45D8F782224DBB500D6C124 /* PBXTargetDependency */,
+                               D45D8F742224DB9C00D6C124 /* PBXTargetDependency */,
+                               D45D8F722224DB9200D6C124 /* PBXTargetDependency */,
+                               D45D8F6C2224DABA00D6C124 /* PBXTargetDependency */,
+                               D45D8F662224DA9900D6C124 /* PBXTargetDependency */,
+                               D45D8F6A2224DA9900D6C124 /* PBXTargetDependency */,
+                               D45D8F642224DA8E00D6C124 /* PBXTargetDependency */,
+                               D45D8F622224DA8400D6C124 /* PBXTargetDependency */,
+                               D45D8F602224DA6600D6C124 /* PBXTargetDependency */,

                                BE061EB31EE5EAC800B22118 /* PBXTargetDependency */,
                                EB1C4CB21E85884300404981 /* PBXTargetDependency */,
                                EB1C4CB41E85884300404981 /* PBXTargetDependency */,
                                BE061EB31EE5EAC800B22118 /* PBXTargetDependency */,
                                EB1C4CB21E85884300404981 /* PBXTargetDependency */,
                                EB1C4CB41E85884300404981 /* PBXTargetDependency */,


@@ -441,8 +704,7 @@
                                EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */,
                                EB10557D1E14DFB60003C309 /* PBXTargetDependency */,
                                BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */,
                                EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */,
                                EB10557D1E14DFB60003C309 /* PBXTargetDependency */,
                                BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */,

-                               DCDB29781FD883AB00B5D242 /* PBXTargetDependency */,
-                               47D991D020407F7E0078CAE2 /* PBXTargetDependency */,
+                               EBB8521222F793AC00424FD0 /* PBXTargetDependency */,

                        );
                        name = Security_tests_ios;
                        productName = Security_test_ios;
                        );
                        name = Security_tests_ios;
                        productName = Security_test_ios;


@@ -453,138 +715,113 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (

-                               DC71D9E11D95BAC40065FB93 /* PBXTargetDependency */,

                                DC178BF31D77ABE300B50D50 /* PBXTargetDependency */,
                                DC178BF31D77ABE300B50D50 /* PBXTargetDependency */,

-                               BE9C38C81EB115A7007E2AE1 /* PBXTargetDependency */,
+                               DC647C44208A85BE00D0F9F8 /* PBXTargetDependency */,

                                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */,
                                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */,

+                               D4F56BB32181306900FCA6B7 /* PBXTargetDependency */,
+                               0C65BB4D23C3F31B0063D2B7 /* PBXTargetDependency */,

                        );
                        name = Security_frameworks_osx;
                        productName = Security_frameworks_macos;
                };
                        );
                        name = Security_frameworks_osx;
                        productName = Security_frameworks_macos;
                };

-               E79EEDE01CD4000C00C2FBFC /* Security_executables */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = E79EEDE11CD4000C00C2FBFC /* Build configuration list for PBXAggregateTarget "Security_executables" */;
-                       buildPhases = (
-                       );
-                       dependencies = (
-                               E79EEDE51CD4001300C2FBFC /* PBXTargetDependency */,
-                       );
-                       name = Security_executables;
-                       productName = Security_executables;
-               };

                E7CFF6471C84F61200E3484E /* Security_KeychainCircle */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = E7CFF66F1C84F61200E3484E /* Build configuration list for PBXAggregateTarget "Security_KeychainCircle" */;
                        buildPhases = (
                E7CFF6471C84F61200E3484E /* Security_KeychainCircle */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = E7CFF66F1C84F61200E3484E /* Build configuration list for PBXAggregateTarget "Security_KeychainCircle" */;
                        buildPhases = (

+                               D4E0E9C32224E18900A802E0 /* ShellScript */,

                        );
                        dependencies = (
                        );
                        dependencies = (

-                               E7CFF6711C84F62900E3484E /* PBXTargetDependency */,
-                               E7CFF6731C84F62900E3484E /* PBXTargetDependency */,
-                               EBFBC2B01E76582C00A34469 /* PBXTargetDependency */,

                        );
                        name = Security_KeychainCircle;
                        productName = Security_KeychainCircle;
                };
                        );
                        name = Security_KeychainCircle;
                        productName = Security_KeychainCircle;
                };

-               EB6A6FA81B90F83A0045DC68 /* phase1_ios */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = EB6A6FA91B90F83A0045DC68 /* Build configuration list for PBXAggregateTarget "phase1_ios" */;
-                       buildPhases = (
-                       );
-                       dependencies = (
-                               EB6A6FAD1B90F84D0045DC68 /* PBXTargetDependency */,
-                       );
-                       name = phase1_ios;
-                       productName = phase1_ios;
-               };

                EB6A6FAE1B90F8810045DC68 /* Security_executables_bridge */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = EB6A6FAF1B90F8810045DC68 /* Build configuration list for PBXAggregateTarget "Security_executables_bridge" */;
                        buildPhases = (
                        );
                        dependencies = (
                EB6A6FAE1B90F8810045DC68 /* Security_executables_bridge */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = EB6A6FAF1B90F8810045DC68 /* Build configuration list for PBXAggregateTarget "Security_executables_bridge" */;
                        buildPhases = (
                        );
                        dependencies = (

+                               6C7BE2EA23C3DD9C003BB2CA /* PBXTargetDependency */,

                                47455B24205B3E2F008FE980 /* PBXTargetDependency */,
                                D41257F71E941E9600781F23 /* PBXTargetDependency */,
                                47455B24205B3E2F008FE980 /* PBXTargetDependency */,
                                D41257F71E941E9600781F23 /* PBXTargetDependency */,

-                               DAE40BD520CF3ED5002D5674 /* PBXTargetDependency */,

                        );
                        name = Security_executables_bridge;
                        productName = Security_executables_Bridge;
                };
                        );
                        name = Security_executables_bridge;
                        productName = Security_executables_Bridge;
                };

-               EB6A6FB41B90F8C90045DC68 /* phase2 */ = {
+               EB7E90F12193F90700B1FA21 /* Build C2 Metrics */ = {

                        isa = PBXAggregateTarget;
                        isa = PBXAggregateTarget;

-                       buildConfigurationList = EB6A6FB51B90F8C90045DC68 /* Build configuration list for PBXAggregateTarget "phase2" */;
+                       buildConfigurationList = EB7E90F22193F90800B1FA21 /* Build configuration list for PBXAggregateTarget "Build C2 Metrics" */;

                        buildPhases = (
                        buildPhases = (

+                               EB7E90F52193F91200B1FA21 /* ShellScript */,

                        );
                        dependencies = (
                        );
                        dependencies = (

-                               EB6A6FB91B90F8D70045DC68 /* PBXTargetDependency */,

                        );
                        );

-                       name = phase2;
-                       productName = phase2;
+                       name = "Build C2 Metrics";
+                       productName = "Build C2 Metrics";

                };
                EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = EB9C1DAF1BDFD4DF00F89272 /* Build configuration list for PBXAggregateTarget "SecurityBatsTests" */;
                        buildPhases = (
                                EB9C1DB41BDFD4F200F89272 /* Install BATS plist */,
                };
                EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */ = {
                        isa = PBXAggregateTarget;
                        buildConfigurationList = EB9C1DAF1BDFD4DF00F89272 /* Build configuration list for PBXAggregateTarget "SecurityBatsTests" */;
                        buildPhases = (
                                EB9C1DB41BDFD4F200F89272 /* Install BATS plist */,

-                               EBC15E801BE29A8C001C0C5B /* Chown BATS plist */,
+                               EBC15E801BE29A8C001C0C5B /* Generate and Chown BATS plist */,
+                               EBA12514225E55C200138070 /* Check for SYSTEM_FRAMEWORK_SEARCH_PATHS */,

                        );
                        dependencies = (
                                EBCF743F1CE593A700BED7CA /* PBXTargetDependency */,
                                EB433A2C1CC3252A00A7EACE /* PBXTargetDependency */,
                                EBA9AA891CE3E76C004E2B68 /* PBXTargetDependency */,
                                EB3A8E011BEEC6F3001A89AA /* PBXTargetDependency */,
                        );
                        dependencies = (
                                EBCF743F1CE593A700BED7CA /* PBXTargetDependency */,
                                EB433A2C1CC3252A00A7EACE /* PBXTargetDependency */,
                                EBA9AA891CE3E76C004E2B68 /* PBXTargetDependency */,
                                EB3A8E011BEEC6F3001A89AA /* PBXTargetDependency */,

-                               EB63ADE11C3E74F900C45A69 /* PBXTargetDependency */,

                                EB425CD11C6585F1000ECE53 /* PBXTargetDependency */,
                                EB425CD11C6585F1000ECE53 /* PBXTargetDependency */,

+                               EB63ADE11C3E74F900C45A69 /* PBXTargetDependency */,

                        );
                        name = SecurityBatsTests;
                        productName = SecurityBatsTests;
                };
                        );
                        name = SecurityBatsTests;
                        productName = SecurityBatsTests;
                };

-               F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */ = {
-                       isa = PBXAggregateTarget;
-                       buildConfigurationList = F93C49031AB8FCE00047E01A /* Build configuration list for PBXAggregateTarget "ckcdiagnose.sh" */;
-                       buildPhases = (
-                               F93C49061AB8FCE50047E01A /* CopyFiles */,
-                       );
-                       dependencies = (
-                       );
-                       name = ckcdiagnose.sh;
-                       productName = ckcdiagnose.sh;
-               };

 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
                091B39732063B67700ECAB6F /* RemoteServiceDiscovery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */; };
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
                091B39732063B67700ECAB6F /* RemoteServiceDiscovery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */; };

-               0927FEBC1F81338600864E07 /* SecKeyProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E9991F1F7D76550018DF67 /* SecKeyProxy.m */; };

                0940F6F82151316500C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                0940F6F92151316600C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                0940F6F82151316500C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                0940F6F92151316600C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };

-               096C647020AB1BC700D7B7D5 /* KeychainEntitlementsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */; };
-               09A3B9D81F8267BB00C5C324 /* SecKeyProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               09A3B9D91F8267BB00C5C324 /* SecKeyProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               09A3B9E11F82734400C5C324 /* si-44-seckey-proxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */; };
-               09A3B9E21F838A3400C5C324 /* SecKeyProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E9991F1F7D76550018DF67 /* SecKeyProxy.m */; };
-               09BFE35C20A32E0E008511E9 /* KeychainEntitlementsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */; };
+               097CE59F246966A100958AF8 /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };

                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */ = {isa = PBXBuildFile; fileRef = 09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */; };
                09EF431B21A5A8CC0066CF20 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */ = {isa = PBXBuildFile; fileRef = 09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */; };
                09EF431B21A5A8CC0066CF20 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };

-               0C0582AE20D9657800D7BD7A /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C0582B820D9B70D00D7BD7A /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
+               0C00FC86217A980100C8BF00 /* OTLocalCuttlefishReset.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C00FC81217A971800C8BF00 /* OTLocalCuttlefishReset.m */; };
+               0C0203E623A857C1005D0A68 /* OTEscrowRecord.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0C0203E023A8564E005D0A68 /* OTEscrowRecord.proto */; };
+               0C0582C620D9CA4800D7BD7A /* OTClique.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CDBCD8620AD03FB007F8EA7 /* OTClique.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0C0582CC20D9CA4900D7BD7A /* OTClique.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CDBCD8620AD03FB007F8EA7 /* OTClique.h */; settings = {ATTRIBUTES = (Private, ); }; };

                0C0BDB32175685B000BC1A7E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB31175685B000BC1A7E /* main.m */; };
                0C0BDB881756A51000BC1A7E /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                0C0BDB8D1756A66100BC1A7E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                0C0BDB8F1756A6D500BC1A7E /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                0C0BDB911756A8A400BC1A7E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                0C0BDB32175685B000BC1A7E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB31175685B000BC1A7E /* main.m */; };
                0C0BDB881756A51000BC1A7E /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                0C0BDB8D1756A66100BC1A7E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                0C0BDB8F1756A6D500BC1A7E /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                0C0BDB911756A8A400BC1A7E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };

-               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 */; };
+               0C0C4F86216FB73C00C14C61 /* EscrowKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */; };
+               0C0C4F87216FB73F00C14C61 /* BottledPeer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */; };
+               0C0CB73923AD714D0020C6BF /* Container_EscrowRecords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */; };
+               0C0CB73A23AD715A0020C6BF /* Container_EscrowRecords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */; };
+               0C0CB73B23AD71650020C6BF /* Container_EscrowRecords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */; };

                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */; };
                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */; };

+               0C0D920C23BFEAB30070A68C /* OTCDPRecoveryInformation.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D920523BFEA740070A68C /* OTCDPRecoveryInformation.proto */; };

                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 */; };
                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 */; };

+               0C0E60DA20D033E400E654F2 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0C0E60E020D033E400E654F2 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0C12B1F12138D31600BE0A98 /* OTClientStateMachine.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C12B1F02138D31600BE0A98 /* OTClientStateMachine.m */; };
+               0C147A2823F39CD10034F08B /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };

                0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.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 */; };
                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 */; };
+               0C1637301FD206BC00210823 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               0C1B8BB72233244F0094D5DA /* OTVouchWithRecoveryKeyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C1B8BB52233241E0094D5DA /* OTVouchWithRecoveryKeyOperation.m */; };
+               0C29BF222323288C003C807E /* OTDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE06E521C6E26000FB1493 /* OTDefines.m */; };
+               0C29BF2523232897003C807E /* OTDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE06E521C6E26000FB1493 /* OTDefines.m */; };
+               0C2B32A423C4000F00A97B18 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               0C2B32A523C4001900A97B18 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };

                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 */; };
                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 */; };


@@ -595,34 +832,85 @@
                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 */; };
                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 */; };
+               0C2F337220DD64930031A92D /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F337120DD647D0031A92D /* OTRamping.m */; };
+               0C2F337320DD64940031A92D /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F337120DD647D0031A92D /* OTRamping.m */; };
+               0C3810F123EF6FC4002D7E19 /* OctagonTrust.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */; };
+               0C38AA92212B2D1900C90A1D /* OTEpochOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4F4DE121153659007F7E20 /* OTEpochOperation.h */; };
+               0C38AA96212B2D1E00C90A1D /* OTClientVoucherOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CC8A9002123AA3B005D7F6A /* OTClientVoucherOperation.h */; };
+               0C38AA98212B2D2300C90A1D /* OTJoinWithVoucherOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CC8A9052123AF16005D7F6A /* OTJoinWithVoucherOperation.h */; };
+               0C3BB3582188E18C0018FC14 /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3522188E18A0018FC14 /* OTPrivateKey+SF.m */; };
+               0C3BB35A2188E18C0018FC14 /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3542188E18B0018FC14 /* OTAuthenticatedCiphertext+SF.m */; };

                0C3C00731EF3636500AB19FE /* secd-155-otr-negotiation-monitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C00721EF3636300AB19FE /* secd-155-otr-negotiation-monitor.m */; };
                0C3C00731EF3636500AB19FE /* secd-155-otr-negotiation-monitor.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C00721EF3636300AB19FE /* secd-155-otr-negotiation-monitor.m */; };

+               0C3C47C624902D960084B951 /* OTSupportOctagonMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C47C024902D450084B951 /* OTSupportOctagonMessage.m */; };
+               0C3C47C724902D960084B951 /* OTSupportSOSMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C47C324902D460084B951 /* OTSupportSOSMessage.m */; };
+               0C3C47C824902DA50084B951 /* OTSupportSOSMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C47C324902D460084B951 /* OTSupportSOSMessage.m */; };
+               0C3C47C924902DA50084B951 /* OTSupportOctagonMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C47C024902D450084B951 /* OTSupportOctagonMessage.m */; };
+               0C3DF8C824789C3C009CF03A /* Container_Peers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3DF8C524789C04009CF03A /* Container_Peers.swift */; };
+               0C3DF8C924789D06009CF03A /* Container_Peers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3DF8C524789C04009CF03A /* Container_Peers.swift */; };
+               0C3DF8CA24789D0A009CF03A /* Container_Peers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3DF8C524789C04009CF03A /* Container_Peers.swift */; };
+               0C3E316B21372FA50093C04B /* OctagonPairingTests+ProximitySetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C6604812134DD5D00BFBBB8 /* OctagonPairingTests+ProximitySetup.swift */; };
+               0C468FE123C7D487006F4582 /* OTEscrowRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FDE23C7D471006F4582 /* OTEscrowRecord.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FE223C7D487006F4582 /* OTEscrowRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */; };
+               0C468FE323C7D487006F4582 /* OTEscrowRecordMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FDA23C7D41D006F4582 /* OTEscrowRecordMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FE423C7D487006F4582 /* OTEscrowRecordMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */; };
+               0C468FE523C7D487006F4582 /* OTEscrowRecordMetadataClientMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FDB23C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FE623C7D487006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */; };
+               0C468FEF23C7D4D5006F4582 /* OTCDPRecoveryInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FEA23C7D4C8006F4582 /* OTCDPRecoveryInformation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FF023C7D4D5006F4582 /* OTCDPRecoveryInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FEE23C7D4CA006F4582 /* OTCDPRecoveryInformation.m */; };
+               0C468FF123C7D4D5006F4582 /* OTEscrowAuthenticationInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FE823C7D4C8006F4582 /* OTEscrowAuthenticationInformation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FF223C7D4D5006F4582 /* OTEscrowAuthenticationInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FEC23C7D4C9006F4582 /* OTEscrowAuthenticationInformation.m */; };
+               0C468FF323C7D4D5006F4582 /* OTICDPRecordContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FE723C7D4C7006F4582 /* OTICDPRecordContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FF423C7D4D5006F4582 /* OTICDPRecordContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FED23C7D4C9006F4582 /* OTICDPRecordContext.m */; };
+               0C468FF523C7D4D5006F4582 /* OTICDPRecordSilentContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C468FE923C7D4C8006F4582 /* OTICDPRecordSilentContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C468FF623C7D4D5006F4582 /* OTICDPRecordSilentContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FEB23C7D4C9006F4582 /* OTICDPRecordSilentContext.m */; };
+               0C468FF723C7D4E3006F4582 /* OTEscrowRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */; };
+               0C468FF823C7D4E3006F4582 /* OTEscrowRecordMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */; };
+               0C468FF923C7D4E3006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */; };
+               0C468FFA23C7D4EF006F4582 /* OTEscrowRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */; };
+               0C468FFB23C7D4EF006F4582 /* OTEscrowRecordMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */; };
+               0C468FFC23C7D4EF006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */; };
+               0C468FFD23C7D4F9006F4582 /* OTEscrowRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */; };
+               0C468FFE23C7D4F9006F4582 /* OTEscrowRecordMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */; };
+               0C468FFF23C7D4F9006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */; };

                0C46A5712034C6BA00F17112 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.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 */; };
                0C4899231E0F386900C6CF70 /* SOSAccountTrustClassic.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4899221E0F386900C6CF70 /* SOSAccountTrustClassic.h */; };
                0C48990B1E0E0FF300C6CF70 /* SOSTransportCircleCK.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C48990A1E0E0FF300C6CF70 /* SOSTransportCircleCK.h */; };
                0C4899121E0E105D00C6CF70 /* SOSTransportCircleCK.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C4899111E0E105D00C6CF70 /* SOSTransportCircleCK.m */; };
                0C4899231E0F386900C6CF70 /* SOSAccountTrustClassic.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C4899221E0F386900C6CF70 /* SOSAccountTrustClassic.h */; };

-               0C52C1FF20003BCA003F0733 /* OTTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C52C1FE20003BCA003F0733 /* OTTestsBase.m */; };
-               0C5663EC20BE2DF30035F362 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0C5663EF20BE2E220035F362 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               0C48B380202E438100A0E1AA /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
+               0C4CDE6F22922E550050C499 /* OctagonTests+RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */; };
+               0C4F4DE221153E9E007F7E20 /* OTEpochOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C4F4DDA211535E8007F7E20 /* OTEpochOperation.m */; };
+               0C5258BA21BB062F00B32C96 /* FakeSOSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5258B821BB05C100B32C96 /* FakeSOSControl.m */; };
+               0C5258BB21BB128000B32C96 /* FakeSOSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5258B821BB05C100B32C96 /* FakeSOSControl.m */; };
+               0C5258BD21BB137900B32C96 /* FakeSOSControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C5258BC21BB137800B32C96 /* FakeSOSControl.h */; };
+               0C570B7923F3A015001FEB3B /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0C570B7B23F3A09A001FEB3B /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0C570B7C23F3A0E3001FEB3B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               0C570B8123F3A1EC001FEB3B /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0C5824A52286002D009E8C15 /* OctagonTests+HealthCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C5824A322860001009E8C15 /* OctagonTests+HealthCheck.swift */; };

                0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; settings = {ATTRIBUTES = (Weak, ); }; };
                0C5960811FB369C50095BA29 /* CKKSHealTLKSharesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */; };
                0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; settings = {ATTRIBUTES = (Weak, ); }; };
                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 */; };
-               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 */; };
-               0C7756CD209A664800268D2C /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0C7756CE209A694100268D2C /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
+               0C61F1F62194FC79009566D4 /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3522188E18A0018FC14 /* OTPrivateKey+SF.m */; };
+               0C61F1F92194FC82009566D4 /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3542188E18B0018FC14 /* OTAuthenticatedCiphertext+SF.m */; };
+               0C64C0802485B2EF00D84A5D /* OTPreloadOctagonKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C64C07C2485A53000D84A5D /* OTPreloadOctagonKeysOperation.m */; };
+               0C66046A2134983900BFBBB8 /* OTEstablishOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6604692134983900BFBBB8 /* OTEstablishOperation.m */; };
+               0C66047E2134CA5600BFBBB8 /* OTDeviceInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C66047B2134C88C00BFBBB8 /* OTDeviceInformation.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 */; };
                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 */; };
+               0C79213D23C3F6E100193389 /* OctagonTrust.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD743B723C3ED7E00FA0EC5 /* OctagonTrust.m */; };
+               0C7A8BBF21714CDC00F4C480 /* OTJoiningConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8FD549214AECD70098E3FB /* OTJoiningConfiguration.m */; };
+               0C7A8BC021714D0E00F4C480 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               0C84D8341FCF43AF00B822E3 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C84D8351FCF43BB00B822E3 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C84D8371FCF43BF00B822E3 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C84D8381FCF43BF00B822E3 /* OTControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */; };
+               0C84D8391FCF43CA00B822E3 /* OTManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0F1FCB481800580909 /* OTManager.m */; };
+               0C84D83B1FCF443A00B822E3 /* otctl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBEF71FCB405700580909 /* otctl.m */; };
+               0C84D83C1FCF448200B822E3 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
+               0C84D83D1FCF449700B822E3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
+               0C85DFE71FB38BB6000343A7 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.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 */; };
                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 */; };


@@ -641,98 +929,172 @@
                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, ); }; };
                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 */; };
-               0C9AEEAF20783FBB00BF6237 /* SFSignInAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */; };
-               0C9AEEBB20783FF900BF6237 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               0C9AEEBE207843D000BF6237 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
-               0C9FB40720D872A600864612 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C9FB40820D8731800864612 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C9FB40920D8735500864612 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
+               0C87D3D9229326AA007853B5 /* OTEnsureOctagonKeyConsistency.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C87D3D6229326A2007853B5 /* OTEnsureOctagonKeyConsistency.m */; };
+               0C87D3E4229368BD007853B5 /* OctagonTests+SOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C87D3E2229368A7007853B5 /* OctagonTests+SOS.swift */; };
+               0C8884012154C4E80053224D /* OTJoiningConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8FD549214AECD70098E3FB /* OTJoiningConfiguration.m */; };
+               0C8884042154C4EA0053224D /* OTJoiningConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8FD549214AECD70098E3FB /* OTJoiningConfiguration.m */; };
+               0C8FD52521483EF20098E3FB /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
+               0C97867D235A77230040A867 /* com.apple.security.signposts.plist in Copy System logging profile */ = {isa = PBXBuildFile; fileRef = 0C97867C235A76E70040A867 /* com.apple.security.signposts.plist */; };
+               0C98122821ACCC9300784441 /* OTClique.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F336A20DD643B0031A92D /* OTClique.m */; };
+               0C9A54B6250C286100FF007B /* OctagonTrustTests+Errors.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9A54B4250C27F100FF007B /* OctagonTrustTests+Errors.m */; };
+               0C9F65AD23E3AD2E00B1A2C5 /* OTEscrowTranslation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C9F65AC23E3ACF700B1A2C5 /* OTEscrowTranslation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0C9F65AE23E3AD3200B1A2C5 /* OTEscrowTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9F65AA23E3ACF700B1A2C5 /* OTEscrowTranslation.m */; };
+               0CA1D0B923E9034600021038 /* OctagonTests+EscrowTestVectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA1D0B223E9023100021038 /* OctagonTests+EscrowTestVectors.swift */; };
+               0CA2282F2187A5CA00A1C56C /* BottledPeer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */; };
+               0CA378E723876DFC00090B7E /* reset_ick_account in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0C7382F023863AD5004F98CB /* reset_ick_account */; };
+               0CA4B4722171410200B17169 /* EscrowKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */; };

                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, ); }; };
                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, ); }; };

+               0CA7020A2280D5BD0085AC54 /* OTCheckHealthOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CA702082280D5600085AC54 /* OTCheckHealthOperation.m */; };

                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 */; };
                0CAD1E591E1C5CBD00537693 /* secd-52-offering-gencount-reset.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C4F1D8085D800865A7C /* secd-52-offering-gencount-reset.m */; };
                0CAD1E5A1E1C5CD100537693 /* secd-71-engine-save.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C641D8085D800865A7C /* secd-71-engine-save.m */; };
                0CAD1E5D1E1C5CF900537693 /* secd-80-views-alwayson.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E08B1DFD0A380021E1B7 /* secd-80-views-alwayson.m */; };
                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 */; };
                0CAD1E591E1C5CBD00537693 /* secd-52-offering-gencount-reset.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C4F1D8085D800865A7C /* secd-52-offering-gencount-reset.m */; };
                0CAD1E5A1E1C5CD100537693 /* secd-71-engine-save.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C641D8085D800865A7C /* secd-71-engine-save.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 */; };
+               0CADDF0721545CF100DF8B06 /* OctagonPairingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CADDF0421545C8E00DF8B06 /* OctagonPairingTests.swift */; };

                0CB50A0D20AA486800FE4675 /* SOSAccountTrustClassic+Expansion.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760471E12F2F200B4381E /* SOSAccountTrustClassic+Expansion.m */; };
                0CB50A0E20AA4C2F00FE4675 /* SOSAccountTrustClassic+Circle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760491E12F30200B4381E /* SOSAccountTrustClassic+Circle.m */; };
                0CB50A0D20AA486800FE4675 /* SOSAccountTrustClassic+Expansion.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760471E12F2F200B4381E /* SOSAccountTrustClassic+Expansion.m */; };
                0CB50A0E20AA4C2F00FE4675 /* SOSAccountTrustClassic+Circle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE760491E12F30200B4381E /* SOSAccountTrustClassic+Circle.m */; };

-               0CB9754E2023A8DD008D6B48 /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
+               0CB582C82189157F0040C5F2 /* OTAuthenticatedCiphertext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C5218915390040C5F2 /* OTAuthenticatedCiphertext.m */; };
+               0CB582C92189157F0040C5F2 /* OTBottle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C4218915390040C5F2 /* OTBottle.m */; };
+               0CB582CA2189157F0040C5F2 /* OTBottleContents.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C62189153A0040C5F2 /* OTBottleContents.m */; };
+               0CB582CB2189157F0040C5F2 /* OTPrivateKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C3218915390040C5F2 /* OTPrivateKey.m */; };
+               0CB582D021891FF40040C5F2 /* OTBottle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C4218915390040C5F2 /* OTBottle.m */; };
+               0CB582D1218920090040C5F2 /* OTAuthenticatedCiphertext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C5218915390040C5F2 /* OTAuthenticatedCiphertext.m */; };
+               0CB582D2218920090040C5F2 /* OTBottleContents.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C62189153A0040C5F2 /* OTBottleContents.m */; };
+               0CB582D3218920090040C5F2 /* OTPrivateKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C3218915390040C5F2 /* OTPrivateKey.m */; };
+               0CB5C677218B803C0044F730 /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3542188E18B0018FC14 /* OTAuthenticatedCiphertext+SF.m */; };
+               0CB5C678218B803C0044F730 /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C3BB3522188E18A0018FC14 /* OTPrivateKey+SF.m */; };
+               0CB72D9D21E42FCF00D8BC9B /* OTApplicantToSponsorRound2M1.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE28E214054F6003BFDB5 /* OTApplicantToSponsorRound2M1.m */; };
+               0CB72D9E21E42FCF00D8BC9B /* OTPairingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE2A2214055CF003BFDB5 /* OTPairingMessage.m */; };
+               0CB72DA021E42FCF00D8BC9B /* OTSponsorToApplicantRound1M2.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE28D214054F6003BFDB5 /* OTSponsorToApplicantRound1M2.m */; };
+               0CB72DA121E42FCF00D8BC9B /* OTSponsorToApplicantRound2M2.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE290214054F7003BFDB5 /* OTSponsorToApplicantRound2M2.m */; };
+               0CB8DC9A2194B14C0021A7C8 /* OTVouchWithBottleOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */; };

                0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.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 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0CBFEACB200FCD2D009A60E9 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0CBFEACC200FCD33009A60E9 /* SFSignInAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               0CBFEACD200FCD33009A60E9 /* SFSignInAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               0CC0445B1FFC4150004A5B63 /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
+               0CBA047D214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBA047C214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift */; };
+               0CBEF3432242CA0600015691 /* TestsObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */; };
+               0CBF883D23AAD9F100652EDD /* OctagonTests+EscrowRecords.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBF883A23AAD9DC00652EDD /* OctagonTests+EscrowRecords.swift */; };

                0CC319241DA46FBF005D42EA /* ProtectedCloudStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43DB542E1BB1F85B0083C3F1 /* ProtectedCloudStorage.framework */; };
                0CC319241DA46FBF005D42EA /* ProtectedCloudStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43DB542E1BB1F85B0083C3F1 /* ProtectedCloudStorage.framework */; };

-               0CC3771320A222BC00B58D2D /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0CC3775020ACA0DF00B58D2D /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0CCCC7C920261D310024405E /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
-               0CCCC7CA20261D310024405E /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
+               0CC593F02299B9AA006C34B5 /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };
+               0CC593F62299EC3D006C34B5 /* OTDeviceInformationAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC19484B21812EC5007C2260 /* OTDeviceInformationAdapter.m */; };
+               0CC593F92299EE06006C34B5 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               0CC8A8FE2123A9F6005D7F6A /* OTClientVoucherOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CC8A8FA2123A9EB005D7F6A /* OTClientVoucherOperation.m */; };
+               0CC8A9032123AF06005D7F6A /* OTJoinWithVoucherOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CC8A9012123AEF7005D7F6A /* OTJoinWithVoucherOperation.m */; };
+               0CC9403023F39E84004B71AA /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0CCC21FC23F33DA900E1FCD0 /* OTICDPRecordContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FED23C7D4C9006F4582 /* OTICDPRecordContext.m */; };
+               0CCC21FD23F33DCE00E1FCD0 /* OTCDPRecoveryInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FEE23C7D4CA006F4582 /* OTCDPRecoveryInformation.m */; };
+               0CCC21FE23F33DD400E1FCD0 /* OTEscrowAuthenticationInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C468FEC23C7D4C9006F4582 /* OTEscrowAuthenticationInformation.m */; };
+               0CCC21FF23F3577A00E1FCD0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
+               0CCC22A023F367D100E1FCD0 /* OctagonTrustTests-EscrowRecords.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCC229F23F367D100E1FCD0 /* OctagonTrustTests-EscrowRecords.m */; };
+               0CCC22A423F374EB00E1FCD0 /* OctagonTrust.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */; };
+               0CCC22A523F3763C00E1FCD0 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               0CCC22A623F3868400E1FCD0 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.m */; };
+               0CCC22A823F38AD600E1FCD0 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               0CCC22A923F38AFD00E1FCD0 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               0CCC22AE23F38B2D00E1FCD0 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               0CCC22B223F38B5B00E1FCD0 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22B123F38B5B00E1FCD0 /* libsqlite3.0.tbd */; };
+               0CCC22B323F38B6D00E1FCD0 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               0CCC22B623F38BCD00E1FCD0 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; };
+               0CCC22B723F38BF500E1FCD0 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
+               0CCC22B823F38C0E00E1FCD0 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
+               0CCC22B923F38C3000E1FCD0 /* CKKSMockSOSPresentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9BC06221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m */; };
+               0CCC22BB23F38C8800E1FCD0 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               0CCC22BC23F38D3500E1FCD0 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               0CCC22BD23F38D4B00E1FCD0 /* libbsm.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EB49B2DC202DF251003F34A0 /* libbsm.tbd */; };
+               0CCC22BE23F38D7C00E1FCD0 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               0CCC22BF23F38D8E00E1FCD0 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               0CCC22C023F38DA100E1FCD0 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               0CCC22C123F38DC100E1FCD0 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               0CCC22C723F3904D00E1FCD0 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               0CCC22C823F390E400E1FCD0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
+               0CCC22C923F3932600E1FCD0 /* CloudKitKeychainSyncingTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */; };
+               0CCC22CA23F3933000E1FCD0 /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
+               0CCC22D623F39B2E00E1FCD0 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0CCC22D723F39B7200E1FCD0 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0CCC22D823F39BCA00E1FCD0 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };

                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCDE7161EEB08220021A946 /* secd-156-timers.m */; };
                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCDE7161EEB08220021A946 /* secd-156-timers.m */; };

+               0CD3D519224048A800024755 /* OTSetRecoveryKeyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD3D5152240479600024755 /* OTSetRecoveryKeyOperation.m */; };
+               0CD5040523F39DEA0036C279 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */; };
+               0CD5797A21498F8200C43496 /* OctagonPairingTests+Piggybacking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD5797721498F7700C43496 /* OctagonPairingTests+Piggybacking.swift */; };
+               0CD743AA23C3EC8000FA0EC5 /* OctagonTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD743A823C3EC8000FA0EC5 /* OctagonTrust.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               0CD743AF23C3ECEB00FA0EC5 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; };
+               0CD743BB23C3EF1D00FA0EC5 /* OTClique+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD743BA23C3EF0D00FA0EC5 /* OTClique+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0CD743BC23C3EF1E00FA0EC5 /* OTClique+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD743BA23C3EF0D00FA0EC5 /* OTClique+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };

                0CD8CB051ECA50780076F37F /* SOSPeerOTRTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD8CB041ECA50780076F37F /* SOSPeerOTRTimer.m */; };
                0CD8CB0B1ECA50920076F37F /* SOSPeerOTRTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD8CB041ECA50780076F37F /* SOSPeerOTRTimer.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 */; };
-               0CE7604C1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE7604B1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m */; };
-               0CE7604E1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE7604D1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m */; };
+               0CD9E34323592DD7002995DE /* OctagonSignPosts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD9E33E235928D1002995DE /* OctagonSignPosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0CD9E34423592DD7002995DE /* OctagonSignPosts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD9E33E235928D1002995DE /* OctagonSignPosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               0CD9E34523592EA6002995DE /* OctagonSignPosts.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD9E340235928E9002995DE /* OctagonSignPosts.m */; };
+               0CD9E34623592EA7002995DE /* OctagonSignPosts.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD9E340235928E9002995DE /* OctagonSignPosts.m */; };
+               0CDD6F79226E83F6009094C2 /* OTTriggerEscrowUpdateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CDD6F76226E62AD009094C2 /* OTTriggerEscrowUpdateOperation.m */; };
+               0CE15E2C222DF63600B7EAA4 /* RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA4 /* RecoveryKey.swift */; };
+               0CE15E2D222DF63600B7EAA4 /* RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA4 /* RecoveryKey.swift */; };
+               0CE15E2F222DF63600B7EAA4 /* RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA4 /* RecoveryKey.swift */; };
+               0CE15E2F222DF63600B7EAA5 /* SetValueTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA5 /* SetValueTransformer.swift */; };
+               0CE15E30222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2B222DF63600B7EAA4 /* RecoverKeySet.swift */; };
+               0CE15E31222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2B222DF63600B7EAA4 /* RecoverKeySet.swift */; };
+               0CE15E33222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2B222DF63600B7EAA4 /* RecoverKeySet.swift */; };
+               0CE15E39222DF67800B7EAA4 /* OTRecovery.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E34222DF66D00B7EAA4 /* OTRecovery.proto */; };
+               0CE15E3E222DF6A800B7EAA4 /* OTRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3A222DF6A600B7EAA4 /* OTRecovery.m */; };
+               0CE15E3F222DF6A800B7EAA4 /* OTRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3A222DF6A600B7EAA4 /* OTRecovery.m */; };
+               0CE15E41222DF6A800B7EAA4 /* OTRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3A222DF6A600B7EAA4 /* OTRecovery.m */; };
+               0CE15E43222DF6A800B7EAA4 /* Recovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3C222DF6A700B7EAA4 /* Recovery.m */; };
+               0CE15E44222DF6A800B7EAA4 /* Recovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3C222DF6A700B7EAA4 /* Recovery.m */; };
+               0CE15E46222DF6A800B7EAA4 /* Recovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E3C222DF6A700B7EAA4 /* Recovery.m */; };

                0CE760501E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE7604F1E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h */; };
                0CE760521E1314F700B4381E /* SOSAccountTrustClassic+Identity.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760511E1314F700B4381E /* SOSAccountTrustClassic+Identity.h */; };
                0CE760541E13155100B4381E /* SOSAccountTrustClassic+Circle.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760531E13155100B4381E /* SOSAccountTrustClassic+Circle.h */; };
                0CE760561E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760551E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h */; };
                0CE760501E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE7604F1E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h */; };
                0CE760521E1314F700B4381E /* SOSAccountTrustClassic+Identity.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760511E1314F700B4381E /* SOSAccountTrustClassic+Identity.h */; };
                0CE760541E13155100B4381E /* SOSAccountTrustClassic+Circle.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760531E13155100B4381E /* SOSAccountTrustClassic+Circle.h */; };
                0CE760561E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CE760551E1316E900B4381E /* SOSAccountTrustClassic+Retirement.h */; };

-               0CF406522072E422003D6A7F /* SFSignInAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */; };
+               0CE780A321421C730049340E /* libcompression.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EB067E8A20EC873D00B7D961 /* libcompression.tbd */; };
+               0CE780AF2142F1350049340E /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D847C51C6BE9710025BB44 /* KeychainCircle.framework */; };
+               0CE887D22299A8CF0082D120 /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               0CE887D32299A9090082D120 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               0CE887D52299A9C70082D120 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               0CE902352395D0A3005E3F8C /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               0CF70BD9218BED1000EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */; };
+               0CF70BDA218BEFAE00EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */; };
+               0CF70BDB218BEFF000EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */; };
+               0CF70BE0218CF26600EC3515 /* BottledPeer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */; };
+               0CF70BE1218CF27600EC3515 /* EscrowKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */; };
+               0CF70BE2218CF2AA00EC3515 /* OTAuthenticatedCiphertext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C5218915390040C5F2 /* OTAuthenticatedCiphertext.m */; };
+               0CF70BE3218CF2AA00EC3515 /* OTBottle.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C4218915390040C5F2 /* OTBottle.m */; };
+               0CF70BE4218CF2AA00EC3515 /* OTBottleContents.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C62189153A0040C5F2 /* OTBottleContents.m */; };
+               0CF70BE5218CF2AA00EC3515 /* OTPrivateKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582C3218915390040C5F2 /* OTPrivateKey.m */; };

                0CFC029C1D41650700E6283B /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                0CFC02C21D41651E00E6283B /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                107226D30D91DB32003CF14F /* SecTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 107226D10D91DB32003CF14F /* SecTask.h */; settings = {ATTRIBUTES = (Private, ); }; };
                18F7F67914D77F4400F88A12 /* NtlmGenerator.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C999BA10AB5F0BB0010451D /* NtlmGenerator.c */; };
                18F7F67A14D77F4400F88A12 /* ntlmBlobPriv.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C999BA30AB5F0BB0010451D /* ntlmBlobPriv.c */; };
                0CFC029C1D41650700E6283B /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                0CFC02C21D41651E00E6283B /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                107226D30D91DB32003CF14F /* SecTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 107226D10D91DB32003CF14F /* SecTask.h */; settings = {ATTRIBUTES = (Private, ); }; };
                18F7F67914D77F4400F88A12 /* NtlmGenerator.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C999BA10AB5F0BB0010451D /* NtlmGenerator.c */; };
                18F7F67A14D77F4400F88A12 /* ntlmBlobPriv.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C999BA30AB5F0BB0010451D /* ntlmBlobPriv.c */; };

+               1B0CDF64231C9E0E004401F0 /* ContainerMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */; };
+               1B2BD395235E050E009A8624 /* SecEC-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B2BD391235E050D009A8624 /* SecEC-tapi.h */; };
+               1B2BD396235E050E009A8624 /* SecPolicy-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B2BD393235E050E009A8624 /* SecPolicy-tapi.h */; };
+               1B2BD397235E050E009A8624 /* Security-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B2BD394235E050E009A8624 /* Security-tapi.h */; };
+               1B4AE38722400A22002188E1 /* TPDictionaryMatchingRules.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8846802237431400738068 /* TPDictionaryMatchingRules.m */; };
+               1B4C444B223AE65500C6F97F /* TPPBPolicyKeyViewMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B4C4448223AE65400C6F97F /* TPPBPolicyKeyViewMapping.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1B4C444C223AE65500C6F97F /* TPPBPolicyKeyViewMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B4C444A223AE65400C6F97F /* TPPBPolicyKeyViewMapping.m */; };
+               1B5EAADC2252ABCD008D27E7 /* OTFetchViewsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B5EAAD92252ABCC008D27E7 /* OTFetchViewsOperation.h */; };
+               1B5EAADD2252ABCD008D27E7 /* OTFetchViewsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B5EAADB2252ABCC008D27E7 /* OTFetchViewsOperation.m */; };
+               1B8341B92239AD3A002BF18A /* TPPBPolicyKeyViewMapping.proto in Sources */ = {isa = PBXBuildFile; fileRef = 1B8341B72239AD39002BF18A /* TPPBPolicyKeyViewMapping.proto */; };
+               1B8D2D96226E1FA500C94238 /* SetValueTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA5 /* SetValueTransformer.swift */; };
+               1B995259226681FA00A2D6CD /* PolicyReporter.h in Sources */ = {isa = PBXBuildFile; fileRef = 1B995256226681ED00A2D6CD /* PolicyReporter.h */; };
+               1B99525A226681FA00A2D6CD /* PolicyReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B995258226681EE00A2D6CD /* PolicyReporter.m */; };
+               1BB1CAB7232C05BD001D0C71 /* CuttlefishXPCWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BB1CAB4232C05BB001D0C71 /* CuttlefishXPCWrapper.m */; };
+               1BB1CAB8232C05BD001D0C71 /* CuttlefishXPCWrapper.h in Sources */ = {isa = PBXBuildFile; fileRef = 1BB1CAB6232C05BC001D0C71 /* CuttlefishXPCWrapper.h */; };
+               1BC6F79C21C9955F005ED67A /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BC6F79821C9955E005ED67A /* util.h */; };
+               1BDEBEF92252DEB1009AD3D6 /* policy_dryrun.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BDEBEF72252DEB1009AD3D6 /* policy_dryrun.m */; };
+               1BDEBEFD2253E6D9009AD3D6 /* policy_dryrun.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BDEBEF72252DEB1009AD3D6 /* policy_dryrun.m */; };
+               1BE85ECF235CEB620051E1D8 /* cms-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ECD235CEB610051E1D8 /* cms-tapi.h */; };
+               1BE85ED0235CEB620051E1D8 /* cms-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ECD235CEB610051E1D8 /* cms-tapi.h */; };
+               1BE85ED2235CEBB40051E1D8 /* secport-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ED1235CEBB30051E1D8 /* secport-tapi.h */; };
+               1BE85ED3235CEBB40051E1D8 /* secport-tapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ED1235CEBB30051E1D8 /* secport-tapi.h */; };
+               1BE85ED5235CEC250051E1D8 /* sslDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ED4235CEC250051E1D8 /* sslDeprecated.h */; };
+               1BE85ED6235CEC250051E1D8 /* sslDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1BE85ED4235CEC250051E1D8 /* sslDeprecated.h */; };
+               1BF640EF222EEB6C002D0FCB /* TPPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BF640EE222EEB6C002D0FCB /* TPPolicyTests.m */; };
+               1F631C5422387F27005920D8 /* legacydevid.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F631C5222387F27005920D8 /* legacydevid.h */; };
+               1F631C5622387FFE005920D8 /* legacydevid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F631C5122387F27005920D8 /* legacydevid.cpp */; };
+               1F631C5722388022005920D8 /* legacydevid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F631C5122387F27005920D8 /* legacydevid.cpp */; };

                220179E31E3BEB7100EFB6F3 /* dirscanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067FD1D8CDF7E007602F1 /* dirscanner.cpp */; };
                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };
                220179EA1E3BF16000EFB6F3 /* slcrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067DB1D8CDF7E007602F1 /* slcrep.cpp */; };
                220179E31E3BEB7100EFB6F3 /* dirscanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067FD1D8CDF7E007602F1 /* dirscanner.cpp */; };
                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };
                220179EA1E3BF16000EFB6F3 /* slcrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067DB1D8CDF7E007602F1 /* slcrep.cpp */; };


@@ -781,6 +1143,7 @@
                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067931D8CDF7E007602F1 /* SecRequirement.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 */; };
                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067931D8CDF7E007602F1 /* SecRequirement.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 */; };

+               3D55EA832242F50B008E7459 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };

                3DD1FF92201FC4EA0086D049 /* SecureTransportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */; };
                3DD1FF93201FC4EF0086D049 /* STLegacyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE8C201AA5150086D049 /* STLegacyTests.m */; };
                3DD1FF94201FC4F40086D049 /* STLegacyTests+ciphers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE89201AA5140086D049 /* STLegacyTests+ciphers.m */; };
                3DD1FF92201FC4EA0086D049 /* SecureTransportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */; };
                3DD1FF93201FC4EF0086D049 /* STLegacyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE8C201AA5150086D049 /* STLegacyTests.m */; };
                3DD1FF94201FC4F40086D049 /* STLegacyTests+ciphers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE89201AA5140086D049 /* STLegacyTests+ciphers.m */; };


@@ -796,7 +1159,6 @@
                3DD1FF9F201FC5410086D049 /* STLegacyTests+sslciphers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE81201AA5100086D049 /* STLegacyTests+sslciphers.m */; };
                3DD1FFA0201FC5450086D049 /* STLegacyTests+tls12.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE7D201AA50E0086D049 /* STLegacyTests+tls12.m */; };
                3DD1FFA1201FC5660086D049 /* ssl-utils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCA451D8B82CD00070CB0 /* ssl-utils.c */; };
                3DD1FF9F201FC5410086D049 /* STLegacyTests+sslciphers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE81201AA5100086D049 /* STLegacyTests+sslciphers.m */; };
                3DD1FFA0201FC5450086D049 /* STLegacyTests+tls12.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE7D201AA50E0086D049 /* STLegacyTests+tls12.m */; };
                3DD1FFA1201FC5660086D049 /* ssl-utils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCA451D8B82CD00070CB0 /* ssl-utils.c */; };

-               3DD1FFA2201FC5800086D049 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };

                3DD1FFA3201FC5870086D049 /* libDiagnosticMessagesClient.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */; };
                3DD1FFA4201FC58F0086D049 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                3DD1FFA5201FC59D0086D049 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                3DD1FFA3201FC5870086D049 /* libDiagnosticMessagesClient.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */; };
                3DD1FFA4201FC58F0086D049 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                3DD1FFA5201FC59D0086D049 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };


@@ -823,11 +1185,18 @@
                3DD1FFC6201FDB1D0086D049 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                3DD1FFC8201FDB1D0086D049 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                3DD1FFC9201FDB1D0086D049 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                3DD1FFC6201FDB1D0086D049 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                3DD1FFC8201FDB1D0086D049 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                3DD1FFC9201FDB1D0086D049 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

-               3DD1FFCB201FDB1D0086D049 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };

                3DD1FFD1201FDC460086D049 /* STLegacyTests+clientauth41.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE78201AA50C0086D049 /* STLegacyTests+clientauth41.m */; };
                3DD1FFD1201FDC460086D049 /* STLegacyTests+clientauth41.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE78201AA50C0086D049 /* STLegacyTests+clientauth41.m */; };

-               3DD1FFD2201FDCA80086D049 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
-               3DD1FFD5201FF7860086D049 /* SecureTransport_iosTests.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DD1FE86201AA5120086D049 /* SecureTransport_iosTests.plist */; };
+               3DD1FFD5201FF7860086D049 /* SecureTransport_iosTests.plist in Copy Plist */ = {isa = PBXBuildFile; fileRef = 3DD1FE86201AA5120086D049 /* SecureTransport_iosTests.plist */; };

                3DD1FFD7201FF7B10086D049 /* SecureTransport_macosTests.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DD1FE79201AA50D0086D049 /* SecureTransport_macosTests.plist */; };
                3DD1FFD7201FF7B10086D049 /* SecureTransport_macosTests.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3DD1FE79201AA50D0086D049 /* SecureTransport_macosTests.plist */; };

+               3DD2589F20478CF900F5DA78 /* STLegacyTests+session.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD2589820478CCE00F5DA78 /* STLegacyTests+session.m */; };
+               3DD258A020478CFA00F5DA78 /* STLegacyTests+session.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD2589820478CCE00F5DA78 /* STLegacyTests+session.m */; };
+               3DD258AC2051F10300F5DA78 /* STLegacyTests+sni.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE7F201AA50F0086D049 /* STLegacyTests+sni.m */; };
+               3E4D49B72531170600B124B3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               3E4D49B82531170600B124B3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               3E4D508F253117DD00B124B3 /* secsecstaticcodeapitest.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E4D508E253117DD00B124B3 /* secsecstaticcodeapitest.c */; };
+               3E88360D24F068EF00E9F4D6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               3E88361424F0699F00E9F4D6 /* secseccodeapitest.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E88361324F0699F00E9F4D6 /* secseccodeapitest.c */; };
+               3E88361B24F08DA100E9F4D6 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };

                433E519E1B66D5F600482618 /* AppSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 433E519D1B66D5F600482618 /* AppSupport.framework */; };
                4381603A1B4DCE8F00C54D58 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                433E519E1B66D5F600482618 /* AppSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 433E519D1B66D5F600482618 /* AppSupport.framework */; };
                4381603A1B4DCE8F00C54D58 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };


@@ -851,8 +1220,6 @@
                4432AF8B1A014664000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                4432AF8D1A01472C000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4432AF8B1A014664000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                4432AF8D1A01472C000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };

-               4432B15E1A014D37000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
-               4432B15F1A014D55000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };

                4432B1601A014D85000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                4432B1611A014D85000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4432B1621A014D8F000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                4432B1601A014D85000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                4432B1611A014D85000958DC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4432B1621A014D8F000958DC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };


@@ -867,15 +1234,13 @@
                44A655A61AA4B4C80059D185 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
                470415DC1E5E1534001F3D95 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 470415DB1E5E1534001F3D95 /* main.m */; };
                470D96711FCDE55B0065FE90 /* SecCDKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */; };
                44A655A61AA4B4C80059D185 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
                470415DC1E5E1534001F3D95 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 470415DB1E5E1534001F3D95 /* main.m */; };
                470D96711FCDE55B0065FE90 /* SecCDKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */; };

-               470D96721FCDE55B0065FE90 /* SecCDKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */; };

                470D96731FCDE55B0065FE90 /* SecCDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 470D96701FCDE55B0065FE90 /* SecCDKeychain.m */; };
                470D96731FCDE55B0065FE90 /* SecCDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 470D96701FCDE55B0065FE90 /* SecCDKeychain.m */; };

-               470D96741FCDE55B0065FE90 /* SecCDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 470D96701FCDE55B0065FE90 /* SecCDKeychain.m */; };

                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
                4718AE10205B39620068EC3F /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                4718AE11205B39620068EC3F /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                4718AE12205B39620068EC3F /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
                4718AE13205B39620068EC3F /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
                4718AE10205B39620068EC3F /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                4718AE11205B39620068EC3F /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                4718AE12205B39620068EC3F /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
                4718AE13205B39620068EC3F /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };

-               4718AE14205B39620068EC3F /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
+               4718AE14205B39620068EC3F /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };

                4718AE15205B39620068EC3F /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                4718AE16205B39620068EC3F /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                4718AE19205B39620068EC3F /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };
                4718AE15205B39620068EC3F /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                4718AE16205B39620068EC3F /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                4718AE19205B39620068EC3F /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };


@@ -883,46 +1248,32 @@
                4718AE1B205B39620068EC3F /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                4718AE1C205B39620068EC3F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                4718AE1E205B39620068EC3F /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                4718AE1B205B39620068EC3F /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                4718AE1C205B39620068EC3F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                4718AE1E205B39620068EC3F /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

-               4718AE1F205B39620068EC3F /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };

                4718AE20205B39620068EC3F /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                4718AE21205B39620068EC3F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                4718AE22205B39620068EC3F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                4718AE23205B39620068EC3F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                4718AE24205B39620068EC3F /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4718AE25205B39620068EC3F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                4718AE20205B39620068EC3F /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                4718AE21205B39620068EC3F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                4718AE22205B39620068EC3F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                4718AE23205B39620068EC3F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                4718AE24205B39620068EC3F /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                4718AE25205B39620068EC3F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };

-               4718AE27205B39620068EC3F /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */; };
-               4718AE29205B39620068EC3F /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */; };
-               4718AE30205B39C40068EC3F /* OTAuthenticatedCiphertext.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */; };
-               4718AE31205B39C40068EC3F /* OTPrivateKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */; };
-               4718AE32205B39C40068EC3F /* OTBottle.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A11FD71CC800933DAC /* OTBottle.proto */; };
-               4718AE33205B39C40068EC3F /* OTBottleContents.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE3405A51FD720C900933DAC /* OTBottleContents.proto */; };
-               4718AE34205B39C40068EC3F /* CKKSSerializedKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */; };
+               4718AE27205B39620068EC3F /* com.apple.securityd.plist in Launchd plists */ = {isa = PBXBuildFile; fileRef = DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */; };
+               4718AE29205B39620068EC3F /* com.apple.securityd.plist in Copy Logging Files */ = {isa = PBXBuildFile; fileRef = DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */; };

                4718AE35205B39C40068EC3F /* CKKSSQLDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */; };
                4718AE35205B39C40068EC3F /* CKKSSQLDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */; };

-               4718AE36205B39C40068EC3F /* CKKSRateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */; };
-               4718AE37205B39C40068EC3F /* CKKSCKAccountStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB12C41E95A4C000510F5F /* CKKSCKAccountStateTracker.m */; };
+               4718AE37205B39C40068EC3F /* CKKSAccountStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB12C41E95A4C000510F5F /* CKKSAccountStateTracker.m */; };

                4718AE38205B39C40068EC3F /* SecCDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 470D96701FCDE55B0065FE90 /* SecCDKeychain.m */; };
                4718AE38205B39C40068EC3F /* SecCDKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 470D96701FCDE55B0065FE90 /* SecCDKeychain.m */; };

-               4718AE39205B39C40068EC3F /* CKKSPowerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */; };

                4718AE3A205B39C40068EC3F /* CKKSGroupOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */; };
                4718AE3A205B39C40068EC3F /* CKKSGroupOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */; };

-               4718AE3B205B39C40068EC3F /* OTContextRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD9E7FF1FE05B6600F66C38 /* OTContextRecord.m */; };
-               4718AE3C205B39C40068EC3F /* OTPrivateKey+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB0B0DA1FFC45C2007E6A83 /* OTPrivateKey+SF.m */; };

                4718AE3D205B39C40068EC3F /* CKKSManifestLeafRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 476D873A1E6750E200190352 /* CKKSManifestLeafRecord.m */; };
                4718AE3E205B39C40068EC3F /* CKKSItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */; };
                4718AE3F205B39C40068EC3F /* CKKSItemEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */; };
                4718AE40205B39C40068EC3F /* CKKSOutgoingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */; };
                4718AE42205B39C40068EC3F /* CKKSIncomingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B3B1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m */; };
                4718AE3D205B39C40068EC3F /* CKKSManifestLeafRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 476D873A1E6750E200190352 /* CKKSManifestLeafRecord.m */; };
                4718AE3E205B39C40068EC3F /* CKKSItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */; };
                4718AE3F205B39C40068EC3F /* CKKSItemEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */; };
                4718AE40205B39C40068EC3F /* CKKSOutgoingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */; };
                4718AE42205B39C40068EC3F /* CKKSIncomingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B3B1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m */; };

-               4718AE43205B39C40068EC3F /* OTLocalStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */; };

                4718AE44205B39C40068EC3F /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };
                4718AE44205B39C40068EC3F /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };

-               4718AE45205B39C40068EC3F /* OTBottledPeerSigned.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE1BCC61FCE11480017230E /* OTBottledPeerSigned.m */; };

                4718AE46205B39C40068EC3F /* CKKSIncomingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */; };
                4718AE47205B39C40068EC3F /* CKKSOutgoingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */; };
                4718AE48205B39C40068EC3F /* CKKSZoneStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B371DEFADB500A3DAFA /* CKKSZoneStateEntry.m */; };
                4718AE46205B39C40068EC3F /* CKKSIncomingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */; };
                4718AE47205B39C40068EC3F /* CKKSOutgoingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */; };
                4718AE48205B39C40068EC3F /* CKKSZoneStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B371DEFADB500A3DAFA /* CKKSZoneStateEntry.m */; };

-               4718AE49205B39C40068EC3F /* AsymKeybagBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 526965CC1E6E283100627F9D /* AsymKeybagBackup.m */; };

                4718AE4A205B39C40068EC3F /* RateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */; };
                4718AE4B205B39C40068EC3F /* CKKSHealKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */; };
                4718AE4C205B39C40068EC3F /* CKKSCurrentItemPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */; };
                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
                4718AE4E205B39C40068EC3F /* OTManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0F1FCB481800580909 /* OTManager.m */; };
                4718AE4A205B39C40068EC3F /* RateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */; };
                4718AE4B205B39C40068EC3F /* CKKSHealKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */; };
                4718AE4C205B39C40068EC3F /* CKKSCurrentItemPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */; };
                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
                4718AE4E205B39C40068EC3F /* OTManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0F1FCB481800580909 /* OTManager.m */; };

-               4718AE4F205B39C40068EC3F /* OTEscrowKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */; };

                4718AE50205B39C40068EC3F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                4718AE51205B39C40068EC3F /* CKKSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */; };
                4718AE52205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */; };
                4718AE50205B39C40068EC3F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                4718AE51205B39C40068EC3F /* CKKSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */; };
                4718AE52205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */; };


@@ -955,45 +1306,33 @@
                4718AE6D205B39C40068EC3F /* SecItemDb.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C961D8085D800865A7C /* SecItemDb.c */; };
                4718AE6E205B39C40068EC3F /* SecItemSchema.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C981D8085D800865A7C /* SecItemSchema.c */; };
                4718AE6F205B39C40068EC3F /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };
                4718AE6D205B39C40068EC3F /* SecItemDb.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C961D8085D800865A7C /* SecItemDb.c */; };
                4718AE6E205B39C40068EC3F /* SecItemSchema.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C981D8085D800865A7C /* SecItemSchema.c */; };
                4718AE6F205B39C40068EC3F /* OTConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = EB10A3E420356E2000E84270 /* OTConstants.m */; };

-               4718AE70205B39C40068EC3F /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C5CFB37201960FF00913B9C /* OTRamping.m */; };

                4718AE71205B39C40068EC3F /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
                4718AE72205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
                4718AE71205B39C40068EC3F /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
                4718AE72205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };

-               4718AE74205B39C40068EC3F /* OTContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE981FC9DA5A00580909 /* OTContext.m */; };

                4718AE75205B39C40068EC3F /* NSOperationCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447951F5766D200236DB4 /* NSOperationCategories.m */; };
                4718AE76205B39C40068EC3F /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
                4718AE77205B39C40068EC3F /* SecLogSettingsServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CAE1D8085D800865A7C /* SecLogSettingsServer.m */; };
                4718AE78205B39C40068EC3F /* CKKSDeviceStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */; };
                4718AE79205B39C40068EC3F /* CKKSFixups.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */; };
                4718AE75205B39C40068EC3F /* NSOperationCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447951F5766D200236DB4 /* NSOperationCategories.m */; };
                4718AE76205B39C40068EC3F /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
                4718AE77205B39C40068EC3F /* SecLogSettingsServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CAE1D8085D800865A7C /* SecLogSettingsServer.m */; };
                4718AE78205B39C40068EC3F /* CKKSDeviceStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */; };
                4718AE79205B39C40068EC3F /* CKKSFixups.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B431F8D939C00C5E2AE /* CKKSFixups.m */; };

-               4718AE7A205B39C40068EC3F /* OTIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */; };

                4718AE7C205B39C40068EC3F /* SecOTRRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB41D8085D800865A7C /* SecOTRRemote.m */; };
                4718AE7D205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */; };
                4718AE7E205B39C40068EC3F /* CKKSNewTLKOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */; };
                4718AE7F205B39C40068EC3F /* CKKSLockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */; };
                4718AE7C205B39C40068EC3F /* SecOTRRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB41D8085D800865A7C /* SecOTRRemote.m */; };
                4718AE7D205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */; };
                4718AE7E205B39C40068EC3F /* CKKSNewTLKOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */; };
                4718AE7F205B39C40068EC3F /* CKKSLockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */; };

-               4718AE80205B39C40068EC3F /* OTCloudStoreState.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE407AB1FD4769B00F59B31 /* OTCloudStoreState.m */; };

                4718AE81205B39C40068EC3F /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
                4718AE82205B39C40068EC3F /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };
                4718AE83205B39C40068EC3F /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                4718AE84205B39C40068EC3F /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
                4718AE81205B39C40068EC3F /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
                4718AE82205B39C40068EC3F /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };
                4718AE83205B39C40068EC3F /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                4718AE84205B39C40068EC3F /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };

-               4718AE85205B39C40068EC3F /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };

                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */; };
                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */; };

-               4718AE87205B39C40068EC3F /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */; };
+               4718AE87205B39C40068EC3F /* CKKSTLKShareRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341F21F8447AB00AB9BDF /* CKKSTLKShareRecord.m */; };

                4718AE88205B39C40068EC3F /* CKKSHealTLKSharesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */; };
                4718AE89205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };
                4718AE8A205B39C40068EC3F /* SecBackupKeybagEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */; };
                4718AE8B205B39C40068EC3F /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB31D8085D800865A7C /* iCloudTrace.c */; };
                4718AE88205B39C40068EC3F /* CKKSHealTLKSharesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */; };
                4718AE89205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };
                4718AE8A205B39C40068EC3F /* SecBackupKeybagEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */; };
                4718AE8B205B39C40068EC3F /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB31D8085D800865A7C /* iCloudTrace.c */; };

-               4718AE8C205B39C40068EC3F /* CKKSAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* CKKSAPSReceiver.m */; };
-               4718AE8D205B39C40068EC3F /* OTBottledPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBE931FC9DA5700580909 /* OTBottledPeer.m */; };
+               4718AE8C205B39C40068EC3F /* OctagonAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */; };

                4718AE8F205B39C40068EC3F /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };
                4718AE8F205B39C40068EC3F /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };

-               4718AE90205B39C40068EC3F /* OTBottledPeerRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2AD2B21FDA07EF00739F96 /* OTBottledPeerRecord.m */; };
-               4718AE91205B39C40068EC3F /* OTCloudStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C770EC31FCF7E2000B5F0E2 /* OTCloudStore.m */; };

                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };

-               4718AE93205B39C40068EC3F /* OTPreflightInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C36B3172007EE6C0029F7A2 /* OTPreflightInfo.m */; };
-               4718AE95205B39C40068EC3F /* OTAuthenticatedCiphertext+SF.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1911FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m */; };

                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };
                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };

-               4718AE98205B39C40068EC3F /* CKKSZone.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D961E3014250089CF55 /* CKKSZone.m */; };

                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.m */; };
                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.m */; };

-               4718AE9A205B39C40068EC3F /* SFECPublicKey+SPKI.m in Sources */ = {isa = PBXBuildFile; fileRef = BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */; };

                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                4718AE9E205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
                4718AE9F205B39C40068EC3F /* CKKSCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */; };
                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                4718AE9E205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
                4718AE9F205B39C40068EC3F /* CKKSCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */; };


@@ -1002,7 +1341,6 @@
                4718AEA2205B39C40068EC3F /* CKKSGroupOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */; };
                4718AEA3205B39C40068EC3F /* CKKSRateLimiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */; };
                4718AEA4205B39C40068EC3F /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };
                4718AEA2205B39C40068EC3F /* CKKSGroupOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */; };
                4718AEA3205B39C40068EC3F /* CKKSRateLimiter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */; };
                4718AEA4205B39C40068EC3F /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };

-               4718AEA5205B39C40068EC3F /* OTCloudStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBE891FC9DA5200580909 /* OTCloudStore.h */; };

                4718AEA6205B39C40068EC3F /* CKKSResultOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447881F5764C600236DB4 /* CKKSResultOperation.h */; };
                4718AEA7205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */; };
                4718AEA8205B39C40068EC3F /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };
                4718AEA6205B39C40068EC3F /* CKKSResultOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447881F5764C600236DB4 /* CKKSResultOperation.h */; };
                4718AEA7205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */; };
                4718AEA8205B39C40068EC3F /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };


@@ -1020,16 +1358,14 @@
                4718AEB4205B39C40068EC3F /* CKKSMirrorEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */; };
                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */; };
                4718AEB4205B39C40068EC3F /* CKKSMirrorEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */; };
                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */; };

-               4718AEB7205B39C40068EC3F /* OTAuthenticatedCiphertext+SF.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1901FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h */; };
-               4718AEB8205B39C40068EC3F /* CKKSCKAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSCKAccountStateTracker.h */; };
+               4718AEB8205B39C40068EC3F /* CKKSAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */; };

                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */; };
                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */; };

-               4718AEBA205B39C40068EC3F /* CKKSTLKShare.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */; };
+               4718AEBA205B39C40068EC3F /* CKKSTLKShareRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7341F11F8447AB00AB9BDF /* CKKSTLKShareRecord.h */; };

                4718AEBB205B39C40068EC3F /* SecItemDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C951D8085D800865A7C /* SecItemDataSource.h */; };
                4718AEBC205B39C40068EC3F /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */; };
                4718AEBD205B39C40068EC3F /* SecDbKeychainSerializedMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */; };
                4718AEBE205B39C40068EC3F /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };
                4718AEBF205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };
                4718AEBB205B39C40068EC3F /* SecItemDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C951D8085D800865A7C /* SecItemDataSource.h */; };
                4718AEBC205B39C40068EC3F /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */; };
                4718AEBD205B39C40068EC3F /* SecDbKeychainSerializedMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */; };
                4718AEBE205B39C40068EC3F /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };
                4718AEBF205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };

-               4718AEC0205B39C40068EC3F /* SFPublicKey+SPKI.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */; };

                4718AEC1205B39C40068EC3F /* CKKSIncomingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B3A1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h */; };
                4718AEC2205B39C40068EC3F /* SecItemDb.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C971D8085D800865A7C /* SecItemDb.h */; };
                4718AEC3205B39C40068EC3F /* CKKSFixups.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */; };
                4718AEC1205B39C40068EC3F /* CKKSIncomingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B3A1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h */; };
                4718AEC2205B39C40068EC3F /* SecItemDb.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C971D8085D800865A7C /* SecItemDb.h */; };
                4718AEC3205B39C40068EC3F /* CKKSFixups.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */; };


@@ -1047,8 +1383,7 @@
                4718AECF205B39C40068EC3F /* OTManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF101FCB486B00580909 /* OTManager.h */; };
                4718AED0205B39C40068EC3F /* CKKSHealTLKSharesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */; };
                4718AED1205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */; };
                4718AECF205B39C40068EC3F /* OTManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF101FCB486B00580909 /* OTManager.h */; };
                4718AED0205B39C40068EC3F /* CKKSHealTLKSharesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */; };
                4718AED1205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */; };

-               4718AED2205B39C40068EC3F /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; };
-               4718AED3205B39C40068EC3F /* CKKSAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* CKKSAPSReceiver.h */; };
+               4718AED3205B39C40068EC3F /* OctagonAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */; };

                4718AED4205B39C40068EC3F /* NSOperationCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447941F5766D200236DB4 /* NSOperationCategories.h */; };
                4718AED5205B39C40068EC3F /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };
                4718AED6205B39C40068EC3F /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };
                4718AED4205B39C40068EC3F /* NSOperationCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447941F5766D200236DB4 /* NSOperationCategories.h */; };
                4718AED5205B39C40068EC3F /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };
                4718AED6205B39C40068EC3F /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };


@@ -1058,10 +1393,8 @@
                4718AEDA205B39C40068EC3F /* SecDbKeychainSerializedSecretData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */; };
                4718AEDB205B39C40068EC3F /* CKKSItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */; };
                4718AEE3205B3A050068EC3F /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };
                4718AEDA205B39C40068EC3F /* SecDbKeychainSerializedSecretData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */; };
                4718AEDB205B39C40068EC3F /* CKKSItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */; };
                4718AEE3205B3A050068EC3F /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };

-               4718AEE4205B3A060068EC3F /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };

                4718AEE7205B3A420068EC3F /* libsecurityd_bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */; };
                471A03EC1F72E35B000A8904 /* SecDbKeychainItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */; };
                4718AEE7205B3A420068EC3F /* libsecurityd_bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */; };
                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 */; };
                4723C9C21F152EB50082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };
                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };
                472339671FD7155E00CB6A72 /* libprequelite.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339611FD7155C00CB6A72 /* libprequelite.dylib */; };
                4723C9C21F152EB50082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };
                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4723C9C01F152EB10082882F /* SFObjCType.h */; };


@@ -1078,7 +1411,6 @@
                4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                4727FBCD1F991F660003AE36 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCC1F991F660003AE36 /* libsqlite3.dylib */; };
                4727FBCE1F991F820003AE36 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */; };
                4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                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 */; };
                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 */; };


@@ -1094,19 +1426,15 @@
                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 */; };
                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 */; };
+               4727FBEF1F9924FB0003AE36 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };

                473337791FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */; };
                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 */; };
                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 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
                475F37211EE8F23900248FB5 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
                4764E9272059D866005497C9 /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };
                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 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
                475F37211EE8F23900248FB5 /* SFAnalytics.plist in Resources */ = {isa = PBXBuildFile; fileRef = 475F371F1EE8F23900248FB5 /* SFAnalytics.plist */; };
                4764E9272059D866005497C9 /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };

-               4764E92D2059D8BF005497C9 /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };

                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 */; };
                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 */; };


@@ -1114,8 +1442,6 @@
                476541A11F33EDA500413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A21F33EDAD00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A31F33EDCC00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A11F33EDA500413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A21F33EDAD00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A31F33EDCC00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };

-               476541A41F33EDED00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
-               476541A51F33EE1E00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };

                476541A61F33EE2700413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A71F33EE3F00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                47702B181E5E58E600B29577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
                476541A61F33EE2700413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                476541A71F33EE3F00413F65 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                47702B181E5E58E600B29577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };


@@ -1128,85 +1454,40 @@
                4771D980209A75FE00BA9772 /* KeychainDataclassOwner.m in Sources */ = {isa = PBXBuildFile; fileRef = 4771D97F209A75FE00BA9772 /* KeychainDataclassOwner.m */; };
                4771D9A0209B7C2700BA9772 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D99F209B7C2600BA9772 /* Security.framework */; };
                4771D9A2209B7C3900BA9772 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D9A1209B7C3900BA9772 /* Accounts.framework */; };
                4771D980209A75FE00BA9772 /* KeychainDataclassOwner.m in Sources */ = {isa = PBXBuildFile; fileRef = 4771D97F209A75FE00BA9772 /* KeychainDataclassOwner.m */; };
                4771D9A0209B7C2700BA9772 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D99F209B7C2600BA9772 /* Security.framework */; };
                4771D9A2209B7C3900BA9772 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D9A1209B7C3900BA9772 /* Accounts.framework */; };

-               4771DA2520A4C33A00BA9772 /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
-               4771DA2620A4C34800BA9772 /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
-               4771DA2720A4C37D00BA9772 /* OT.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CCCC7C820261D310024405E /* OT.m */; };
-               4771ECCD1F17CD0E00840998 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };

                477A1F5220320E4A00ACD81D /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 477A1F4C20320E4900ACD81D /* Accounts.framework */; };
                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 */; };
                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 */; };
                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 */; };
-               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 */; };
-               478D42931FD72A8100CAB645 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.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 */; };
+               478014541FBF577000C4043D /* si-44-seckey-proxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */; };
+               4780146A1FBF5BD600C4043D /* SecKeyProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E9991F1F7D76550018DF67 /* SecKeyProxy.m */; };
+               478014701FBF5BD800C4043D /* SecKeyProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 09E9991F1F7D76550018DF67 /* SecKeyProxy.m */; };
+               478014791FBF5D2000C4043D /* SecKeyProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4780147F1FBF5D2100C4043D /* SecKeyProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };

                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };

-               479108B81EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
-               47922D211FAA76000008F7E0 /* SecDbKeychainSerializedMetadata.proto in Resources */ = {isa = PBXBuildFile; fileRef = 47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */; };
-               47922D2D1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto in Resources */ = {isa = PBXBuildFile; fileRef = 47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */; };
+               4791B4652118BBFF00977C3F /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4791B46B2118BC0000977C3F /* OTControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4791B46C2118BD0A00977C3F /* SecXPCError.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4791B46D2118BD0B00977C3F /* SecXPCError.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */; settings = {ATTRIBUTES = (Private, ); }; };

                47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
                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 */; };
                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 */; };
                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 */; };
                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 */; };
                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 */; };
                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 */; };
                47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };

-               47922D571FAA7E0E0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };

                479231E82065B31300B2718C /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                479231E82065B31300B2718C /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };

-               479231EE2065B32200B2718C /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };

                479231EF2065C52200B2718C /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
                479231F02065C52D00B2718C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                479DA1721EBBA8D10065C98F /* CKKSManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 47CEED1F1E60DE900044EAB4 /* CKKSManifest.m */; };
                479231EF2065C52200B2718C /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
                479231F02065C52D00B2718C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                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 */; };
                47A91562201A43BA00FF8F46 /* SecSharedCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };
                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 */; };
                47A91562201A43BA00FF8F46 /* SecSharedCredential.h in Headers */ = {isa = PBXBuildFile; fileRef = BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */; settings = {ATTRIBUTES = (Public, ); }; };

-               47B011991F17D78D0030B49F /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };

                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
                47C2F1842059CB680062DE30 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBC41F991C460003AE36 /* Foundation.framework */; };
                47C2F18A2059CB820062DE30 /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };
                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E9391D7F3DF200AFB96E /* CrashReporterSupport.framework */; };
                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
                47C2F1842059CB680062DE30 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBC41F991C460003AE36 /* Foundation.framework */; };
                47C2F18A2059CB820062DE30 /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };

-               47C51B871EEA657D0032D9E5 /* SecurityUnitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 47C51B861EEA657D0032D9E5 /* SecurityUnitTests.m */; };
+               47C51B871EEA657D0032D9E5 /* SecKeyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 47C51B861EEA657D0032D9E5 /* SecKeyTests.m */; };

                47C51B891EEA657D0032D9E5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                47D13759209CD1A200CAD493 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
                47C51B891EEA657D0032D9E5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                47D13759209CD1A200CAD493 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };


@@ -1214,15 +1495,24 @@
                47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 476E918D1E7343B200B4E4D3 /* CKKSManifestTests.m */; };
                47FF17261FD60ACA00875565 /* SFKeychainServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 47FF17241FD60ACA00875565 /* SFKeychainServer.h */; };
                47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 476E918D1E7343B200B4E4D3 /* CKKSManifestTests.m */; };
                47FF17261FD60ACA00875565 /* SFKeychainServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 47FF17241FD60ACA00875565 /* SFKeychainServer.h */; };

-               47FF17271FD60ACA00875565 /* SFKeychainServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 47FF17241FD60ACA00875565 /* SFKeychainServer.h */; };

                47FF17281FD60ACA00875565 /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.m */; };
                47FF17281FD60ACA00875565 /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.m */; };

-               47FF17291FD60ACA00875565 /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.m */; };
+               480ADDB22155A0CE00318FC6 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               480C03DB2145A8490034570E /* SOSTrustedDeviceAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 480C03D321459CD60034570E /* SOSTrustedDeviceAttributes.m */; };
+               480C03DC2145A84F0034570E /* SOSTrustedDeviceAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 480C03D621459CD70034570E /* SOSTrustedDeviceAttributes.h */; };
+               482FE5602177C5DA0031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               482FE5632177C5E80031C11E /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
+               482FE5642177C6850031C11E /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
+               482FE5652177C6D90031C11E /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
+               482FE5662177C6E40031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               482FE56C2177CEEF0031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               482FE56D2177CF150031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               482FE56E2177CF340031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 482FE56B2177C7AE0031C11E /* AuthKit.framework */; };
+               482FE56F2177CF520031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };

                483E798F1DC87605005C0008 /* secd-67-prefixedKeyIDs.m in Sources */ = {isa = PBXBuildFile; fileRef = 483E79891DC875F2005C0008 /* secd-67-prefixedKeyIDs.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 */; };
-               4885DCAD207FF0780071FB7B /* ClientInfoByNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 4885DCAB207FF0780071FB7B /* ClientInfoByNotification.m */; };
+               487A65F4245B65F1005F51D6 /* secd-68-fullPeerInfoIntegrity.m in Sources */ = {isa = PBXBuildFile; fileRef = 487A65F3245B65F1005F51D6 /* secd-68-fullPeerInfoIntegrity.m */; };
+               48AC7B73232B1DA600F02B6F /* SOSIntervalEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 48AC7B71232B1A7000F02B6F /* SOSIntervalEvent.m */; };

                48CC589F1DA5FF2700EBD9DB /* secd-66-account-recovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */; };
                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 */; };

                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */; };
                48FE669720E6E69D00FAEF17 /* SOSAuthKitHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */; };
                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF715AFB73800B9D400 /* SecOTRMath.h */; settings = {ATTRIBUTES = (Private, ); }; };
                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */; };
                48FE669720E6E69D00FAEF17 /* SOSAuthKitHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */; };
                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF715AFB73800B9D400 /* SecOTRMath.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -1354,7 +1644,6 @@
                4C7391790B01745000C4CBFA /* vmdh.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7391770B01745000C4CBFA /* vmdh.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7416040F1D71A2008E0E4D /* SecSCEP.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7416020F1D71A2008E0E4D /* SecSCEP.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7608B30AC34A8100980096 /* SecCertificatePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7608B10AC34A8100980096 /* SecCertificatePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7391790B01745000C4CBFA /* vmdh.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7391770B01745000C4CBFA /* vmdh.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7416040F1D71A2008E0E4D /* SecSCEP.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7416020F1D71A2008E0E4D /* SecSCEP.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7608B30AC34A8100980096 /* SecCertificatePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7608B10AC34A8100980096 /* SecCertificatePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               4C7913251799A5CC00A9633E /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C7913241799A5CB00A9633E /* MobileCoreServices.framework */; };

                4C7CE5700DC7DC6600AE53FC /* SecEntitlements.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C84DA551720698900AEE225 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
                4C87F3A80D611C26000E7104 /* SecTrustPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C87F3A70D611C26000E7104 /* SecTrustPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C7CE5700DC7DC6600AE53FC /* SecEntitlements.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4C84DA551720698900AEE225 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
                4C87F3A80D611C26000E7104 /* SecTrustPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C87F3A70D611C26000E7104 /* SecTrustPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -1411,9 +1700,6 @@
                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, ); }; };
                5269658D1E6A154700627F9D /* SecBackupKeybagEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */; };
                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, ); }; };
                5269658D1E6A154700627F9D /* SecBackupKeybagEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */; };

-               5269658E1E6A154800627F9D /* SecBackupKeybagEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */; };
-               526965D21E6E284400627F9D /* AsymKeybagBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 526965CC1E6E283100627F9D /* AsymKeybagBackup.m */; };
-               526965D31E6E284500627F9D /* AsymKeybagBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 526965CC1E6E283100627F9D /* AsymKeybagBackup.m */; };

                5296CB4E1655B8F5009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                5296CB501655B990009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                5296CB4E1655B8F5009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                5296CB501655B990009912AF /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };


@@ -1422,6 +1708,7 @@
                52A23EDD161DEC3F00E271E0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A23EDB161DEC3700E271E0 /* Default-568h@2x.png */; };
                52D82BDF16A621F70078DFE5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                52D82BEE16A622370078DFE5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                52A23EDD161DEC3F00E271E0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A23EDB161DEC3700E271E0 /* Default-568h@2x.png */; };
                52D82BDF16A621F70078DFE5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                52D82BEE16A622370078DFE5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };

+               52DA3C7123C7E63600FEEDFF /* KCTLKRequestTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 52DA3C6F23C7E63500FEEDFF /* KCTLKRequestTest.m */; };

                5328C0521738903F00708984 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                533B5D4F177CD63100995334 /* SpringBoardServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52222CC0167BDAE100EDD09C /* SpringBoardServices.framework */; };
                5346480217331E1200FE9172 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                5328C0521738903F00708984 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                533B5D4F177CD63100995334 /* SpringBoardServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52222CC0167BDAE100EDD09C /* SpringBoardServices.framework */; };
                5346480217331E1200FE9172 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };


@@ -1429,20 +1716,59 @@
                5346481E173322BD00FE9172 /* KeychainSyncAccountNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 5346481D173322BD00FE9172 /* KeychainSyncAccountNotification.m */; };
                5346481F17332F9C00FE9172 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
                53C0E1FF177FB48A00F8A018 /* CloudKeychain.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };
                5346481E173322BD00FE9172 /* KeychainSyncAccountNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 5346481D173322BD00FE9172 /* KeychainSyncAccountNotification.m */; };
                5346481F17332F9C00FE9172 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
                53C0E1FF177FB48A00F8A018 /* CloudKeychain.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };

-               5A4E381B207529670047F40F /* SecProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A4E381A207529480047F40F /* SecProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5A4E381C207529680047F40F /* SecProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A4E381A207529480047F40F /* SecProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5A4E52792051D7FA009D5826 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               5A4E527B2051D857009D5826 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               5AC6BFAB2077CD310051737D /* SecProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AC6BFA52077CD130051737D /* SecProtocolTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AC6BFAC2077CD310051737D /* SecProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AC6BFA52077CD130051737D /* SecProtocolTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AF762FF2051F990001557AE /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A94C6D4203CC2590066E391 /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               5AF7630920520870001557AE /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A94C6D4203CC2590066E391 /* AuthKit.framework */; };
-               5AFCF32920746BC20010D4B5 /* SecProtocolOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32220746AD80010D4B5 /* SecProtocolOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AFCF32A20746BC30010D4B5 /* SecProtocolOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32220746AD80010D4B5 /* SecProtocolOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AFCF32B20746BC80010D4B5 /* SecProtocolMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32820746AE90010D4B5 /* SecProtocolMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AFCF32C20746BC90010D4B5 /* SecProtocolMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32820746AE90010D4B5 /* SecProtocolMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AFCF32E20746DA70010D4B5 /* SecProtocolObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32D20746D9A0010D4B5 /* SecProtocolObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               5AFCF32F20746DA70010D4B5 /* SecProtocolObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AFCF32D20746D9A0010D4B5 /* SecProtocolObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A04BAF822973E7F001848A0 /* OTFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A04BAF722973E43001848A0 /* OTFollowup.m */; };
+               5A04BAFA22976A15001848A0 /* OTClique.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F336A20DD643B0031A92D /* OTClique.m */; };
+               5A04BAFB22976A16001848A0 /* OTClique.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F336A20DD643B0031A92D /* OTClique.m */; };
+               5A04BB0222982733001848A0 /* OTFollowupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A04BAF922973EA9001848A0 /* OTFollowupTests.m */; };
+               5A04BB1922986717001848A0 /* SecXPCHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A04BB182298670C001848A0 /* SecXPCHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5A04BB1A22986717001848A0 /* SecXPCHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A04BB182298670C001848A0 /* SecXPCHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5A06118E229ED5EB006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
+               5A061191229ED6DB006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
+               5A061194229ED6E7006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
+               5A061196229ED6E8006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
+               5A061197229ED6EB006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
+               5A0F84A522AEAF5B0097AEEA /* NSDate+SFAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1A1C2122A71D2A00CB8D1D /* NSDate+SFAnalyticsTests.m */; };
+               5A43A083225FA39C005450E4 /* SecProtocolHelperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A43A07F225FA38D005450E4 /* SecProtocolHelperTest.m */; };
+               5A43A084225FA3A5005450E4 /* SecProtocolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0B3202E3451001EA371 /* SecProtocolTest.m */; };
+               5A43A085225FA3A5005450E4 /* SecProtocolHelperTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A43A07F225FA38D005450E4 /* SecProtocolHelperTest.m */; };
+               5A43A08A226112DB005450E4 /* SecProtocolConfigurationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AADD4A2B215E83140054FC6D /* SecProtocolConfigurationTest.m */; };
+               5A442F8A233C330F00918373 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
+               5A442FA5233C34FE00918373 /* SecExperimentPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A442F98233C34C000918373 /* SecExperimentPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5A442FA6233C34FE00918373 /* SecExperimentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A442F9B233C34C000918373 /* SecExperimentInternal.h */; };
+               5A442FA7233C34FF00918373 /* SecExperimentPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A442F98233C34C000918373 /* SecExperimentPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5A442FA8233C34FF00918373 /* SecExperimentInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A442F9B233C34C000918373 /* SecExperimentInternal.h */; };
+               5A442FA9233C351000918373 /* SecExperiment.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9C233C34C000918373 /* SecExperiment.m */; };
+               5A442FAA233C351100918373 /* SecExperiment.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9C233C34C000918373 /* SecExperiment.m */; };
+               5A442FAB233C351300918373 /* SecExperiment.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9C233C34C000918373 /* SecExperiment.m */; };
+               5A442FAC233C351500918373 /* SecExperiment.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9C233C34C000918373 /* SecExperiment.m */; };
+               5A442FAD233C351C00918373 /* SecExperimentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9A233C34C000918373 /* SecExperimentTests.m */; };
+               5A442FAE233C352200918373 /* experimentTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A442F9F233C34C000918373 /* experimentTool.m */; };
+               5A47FFB3228F5E5500F781B8 /* KCInitialMessageData.proto in Sources */ = {isa = PBXBuildFile; fileRef = 5A47FFB1228F5DF700F781B8 /* KCInitialMessageData.proto */; };
+               5A47FFB9228F5F2A00F781B8 /* KCInitialMessageData.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A47FFB5228F5E9000F781B8 /* KCInitialMessageData.m */; };
+               5A47FFBA228F60DF00F781B8 /* KCInitialMessageData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A47FFB4228F5E9000F781B8 /* KCInitialMessageData.h */; };
+               5A47FFBE228F6D1B00F781B8 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; };
+               5A6D1B9520810EAD0057CAC8 /* SecProtocolMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B8D20810EA30057CAC8 /* SecProtocolMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A6D1B9620810EAE0057CAC8 /* SecProtocolMetadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B8D20810EA30057CAC8 /* SecProtocolMetadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A6D1B9B20810EDD0057CAC8 /* SecProtocolOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B9320810EA30057CAC8 /* SecProtocolOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A6D1B9C20810EDE0057CAC8 /* SecProtocolOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B9320810EA30057CAC8 /* SecProtocolOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A6D1B9D20810EF40057CAC8 /* SecProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B9420810EA40057CAC8 /* SecProtocolTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A6D1B9E20810EF40057CAC8 /* SecProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A6D1B9420810EA40057CAC8 /* SecProtocolTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5A7E037822272C2D003DB3A0 /* SecProtocolHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A7E037722272C2D003DB3A0 /* SecProtocolHelper.m */; };
+               5A7E037A22272E0E003DB3A0 /* SecProtocolHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A7E037722272C2D003DB3A0 /* SecProtocolHelper.m */; };
+               5A7E037B2227301D003DB3A0 /* SecProtocolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AADD4A28215E82440054FC6D /* SecProtocolInternal.h */; };
+               5A7E037C2227301E003DB3A0 /* SecProtocolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = AADD4A28215E82440054FC6D /* SecProtocolInternal.h */; };
+               5AA465CF2228AF4B00C068F4 /* SecProtocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 5AF593FE1FA0EE5300A5C1EC /* SecProtocol.c */; };
+               5AA465D02228AF4B00C068F4 /* SecProtocolHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A7E037722272C2D003DB3A0 /* SecProtocolHelper.m */; };
+               5AA465D12228AF4B00C068F4 /* SecProtocolConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = AA9FD59B2152AFD70045A07A /* SecProtocolConfiguration.m */; };
+               5AA465D22228AF4B00C068F4 /* SecProtocolTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 78ADC6251FA0FAC5001EB8B6 /* SecProtocolTypes.m */; };
+               5AA465E12229A40400C068F4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
+               5AE4BEEF1FA79456001B9DA4 /* SecProtocolObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AE4BEEE1FA79456001B9DA4 /* SecProtocolObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5AE4BEF01FA79456001B9DA4 /* SecProtocolObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AE4BEEE1FA79456001B9DA4 /* SecProtocolObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5AF593FF1FA0EE5300A5C1EC /* SecProtocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 5AF593FE1FA0EE5300A5C1EC /* SecProtocol.c */; };
+               5AF594001FA0EE5300A5C1EC /* SecProtocol.c in Sources */ = {isa = PBXBuildFile; fileRef = 5AF593FE1FA0EE5300A5C1EC /* SecProtocol.c */; };
+               5AF594021FA1051600A5C1EC /* SecProtocolPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AF594011FA1051500A5C1EC /* SecProtocolPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5AF594031FA1051600A5C1EC /* SecProtocolPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AF594011FA1051500A5C1EC /* SecProtocolPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5E01F5B1227C859200BC884C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

                5E10992619A5E55800A60E2B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                5E10995119A5E5CE00A60E2B /* ISProtectedItems.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E10994E19A5E5CE00A60E2B /* ISProtectedItems.plist */; };
                5E10995219A5E5CE00A60E2B /* ISProtectedItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E10995019A5E5CE00A60E2B /* ISProtectedItemsController.m */; };
                5E10992619A5E55800A60E2B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                5E10995119A5E5CE00A60E2B /* ISProtectedItems.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5E10994E19A5E5CE00A60E2B /* ISProtectedItems.plist */; };
                5E10995219A5E5CE00A60E2B /* ISProtectedItemsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E10995019A5E5CE00A60E2B /* ISProtectedItemsController.m */; };


@@ -1459,108 +1785,189 @@
                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 */; };
                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 */; };

+               5F00F9562306146700B832E0 /* p12import.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2A1D8085FC00865A7C /* p12import.c */; };
+               5F00F9582306147100B832E0 /* p12pbegen.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2C1D8085FC00865A7C /* p12pbegen.c */; };
+               5F00F9592306147A00B832E0 /* SecImportExport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E551D8085FC00865A7C /* SecImportExport.c */; };
+               5F00F95B230614AC00B832E0 /* SecImportExportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F00F95A230614A200B832E0 /* SecImportExportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5F00F95C230614AD00B832E0 /* SecImportExportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F00F95A230614A200B832E0 /* SecImportExportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               5F4C22002489C6AB00F0C425 /* simulatecrash_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F4C21FE2489C68900F0C425 /* simulatecrash_assert.h */; };
+               5F4C22012489C6AC00F0C425 /* simulatecrash_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F4C21FE2489C68900F0C425 /* simulatecrash_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               5F84950222DFB505008B3EFB /* SecTrustExceptionResetCount.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8494FF22DFB502008B3EFB /* SecTrustExceptionResetCount.m */; };
+               6C02134E21F7ED25009D5C80 /* SecDbBackupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */; };
+               6C06CB902408602900025303 /* SecItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */; };
+               6C06CB912408602A00025303 /* SecItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */; };

                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 */; };
                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 */; };

+               6C16258723C4FFEC0086A0FF /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               6C16258823C5001C0086A0FF /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };
                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };

+               6C2045F12424BAC900F9461D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C99786D242362EC008C498D /* main.m */; };
+               6C2045F22424BACE00F9461D /* KeychainStasher.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C99786B242362EC008C498D /* KeychainStasher.m */; };
+               6C2045F42424BBCD00F9461D /* com.apple.security.KeychainStasher.sb in Install Sandbox Profile */ = {isa = PBXBuildFile; fileRef = 6C48D10F2423A3C0004AF950 /* com.apple.security.KeychainStasher.sb */; };
+               6C2045F52424BBDD00F9461D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C997879242364E5008C498D /* Foundation.framework */; };
+               6C2045FB2424BCD600F9461D /* com.apple.security.KeychainStasher.plist in Install LaunchAgent plist */ = {isa = PBXBuildFile; fileRef = 6C2045F92424BCB800F9461D /* com.apple.security.KeychainStasher.plist */; };
+               6C2138C4225183FE007DEDD3 /* SecDbKeychainSerializedMetadataKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */; };
+               6C220088244F075E000A4557 /* SecItemRateLimit.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C513A38244F007B00207D5E /* SecItemRateLimit.m */; };
+               6C22008A244F0760000A4557 /* SecItemRateLimit.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C513A38244F007B00207D5E /* SecItemRateLimit.m */; };
+               6C23F02F227A3A28009F6756 /* com.apple.securityd.sb in Install Sandbox Profile */ = {isa = PBXBuildFile; fileRef = 6C23F02C227A39E9009F6756 /* com.apple.securityd.sb */; };
+               6C2D463D24C88AA10015C3C9 /* LegacyAPICounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C2D463B24C88A870015C3C9 /* LegacyAPICounts.m */; };
+               6C2D463E24C88AA60015C3C9 /* LegacyAPICounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C2D463924C88A700015C3C9 /* LegacyAPICounts.h */; };

                6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };

-               6C32BB9A20EAE6B80042DF59 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
+               6C32D36420F2C23100ACAB2C /* TPPBPolicyRedaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C70D8DE20EBDFD700AB6FAF /* TPPBPolicyRedaction.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C32D36520F2C23D00ACAB2C /* TPPBPolicyDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C0C807420EAF81900334E33 /* TPPBPolicyDocument.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C32D36620F2C23D00ACAB2C /* TPPBPolicyCategoriesByView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C0C809620EB024800334E33 /* TPPBPolicyCategoriesByView.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C32D36720F2C23D00ACAB2C /* TPPBPolicyIntroducersByCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C0C809720EB024900334E33 /* TPPBPolicyIntroducersByCategory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               6C32D36820F2C23D00ACAB2C /* TPPBPolicyModelToCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C0C809820EB024900334E33 /* TPPBPolicyModelToCategory.h */; settings = {ATTRIBUTES = (Private, ); }; };

                6C3446301E24F6BE00F9522B /* CKKSRateLimiterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */; };
                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 */; };
+               6C39234E21F13E4D00D018AD /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               6C39234F21F13E4D00D018AD /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               6C39235021F13E4D00D018AD /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               6C39235221F13E4D00D018AD /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               6C39235321F13E4D00D018AD /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               6C39235421F13E4D00D018AD /* KeychainModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 470D966B1FCDE4BA0065FE90 /* KeychainModel.xcdatamodeld */; };
+               6C39235621F13E4D00D018AD /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               6C39235821F13E4D00D018AD /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               6C39235B21F13E4D00D018AD /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EB80DE57219600CF005B10FA /* libz.dylib */; };
+               6C39235C21F13E4D00D018AD /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 482FE56B2177C7AE0031C11E /* AuthKit.framework */; };
+               6C39235D21F13E4D00D018AD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               6C39235E21F13E4D00D018AD /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
+               6C39235F21F13E4D00D018AD /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               6C39236021F13E4D00D018AD /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 477A1F4C20320E4900ACD81D /* Accounts.framework */; };
+               6C39236121F13E4D00D018AD /* libprequelite.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 472339611FD7155C00CB6A72 /* libprequelite.dylib */; };
+               6C39236321F13E4D00D018AD /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
+               6C39236421F13E4D00D018AD /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE81F9921D00003AE36 /* libACM.a */; };
+               6C39236521F13E4D00D018AD /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE61F9921890003AE36 /* ApplePushService.framework */; };
+               6C39236621F13E4D00D018AD /* SharedWebCredentials.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */; };
+               6C39236721F13E4D00D018AD /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBE01F99212F0003AE36 /* IOKit.framework */; };
+               6C39236821F13E4D00D018AD /* WirelessDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBDA1F9920CB0003AE36 /* WirelessDiagnostics.framework */; };
+               6C39236921F13E4D00D018AD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD81F9920BB0003AE36 /* SystemConfiguration.framework */; };
+               6C39236A21F13E4D00D018AD /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               6C39236B21F13E4D00D018AD /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
+               6C39236C21F13E4D00D018AD /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD41F9920510003AE36 /* ProtocolBuffer.framework */; };
+               6C39236D21F13E4D00D018AD /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               6C39236E21F13E4D00D018AD /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBD21F9920290003AE36 /* CloudKit.framework */; };
+               6C39237021F13E4D00D018AD /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCF1F991F820003AE36 /* SecurityFoundation.framework */; };
+               6C39237121F13E4D00D018AD /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBCC1F991F660003AE36 /* libsqlite3.dylib */; };
+               6C39237221F13E4D00D018AD /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               6C39237321F13E4D00D018AD /* libsecdRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */; };
+               6C39237421F13E4D00D018AD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4727FBC41F991C460003AE36 /* Foundation.framework */; };
+               6C39237B21F13EB400D018AD /* SecDbBackupManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */; };
+               6C39237C21F13EB400D018AD /* SecDbBackupBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC321C334FD00D38D66 /* SecDbBackupBag.m */; };
+               6C39237D21F13EB400D018AD /* SecDbBackupBagIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC621C334FE00D38D66 /* SecDbBackupBagIdentity.m */; };
+               6C39237F21F13EB400D018AD /* SecDbBackupKeyClassSigningKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC221C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.m */; };
+               6C39238121F13EB400D018AD /* SecDbBackupMetadataClassKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC121C334FC00D38D66 /* SecDbBackupMetadataClassKey.m */; };
+               6C39238221F13EB400D018AD /* SecDbBackupRecoverySet.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC021C334FC00D38D66 /* SecDbBackupRecoverySet.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 */; };
                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 */; };

+               6C4AEF88218A09E70012C5DA /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               6C4AEF89218A09E80012C5DA /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               6C4AEF90218A0C170012C5DA /* SecDbBackupManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */; };
+               6C4AEF91218A0C190012C5DA /* SecDbBackupManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */; };
+               6C4AEF96218A127F0012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */; };
+               6C4AEF97218A12810012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */; };
+               6C4AEFA0218A189A0012C5DA /* SecAKSObjCWrappers.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */; };
+               6C4AEFA1218A189B0012C5DA /* SecAKSObjCWrappers.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */; };

                6C4F98252075833E00A3C5AB /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
                6C4F98252075833E00A3C5AB /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };

-               6C53A447206AB1A6000FA611 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };

                6C53A44D206AB1EF000FA611 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6C53A44D206AB1EF000FA611 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };

+               6C540C3922289A3B0032B5BC /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC4A76A92212698B006F2D8F /* CloudServices.framework */; };

                6C588D7F1EAA14AA00D7E322 /* RateLimiterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C588D791EAA149F00D7E322 /* RateLimiterTests.m */; };
                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC7F5B31E9F99EE0014AE63 /* RateLimiter.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, ); }; };
                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, ); }; };

+               6C5D62A6221B6E3F00AF79DC /* secdxctests-entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6C5D62A5221B6E3F00AF79DC /* secdxctests-entitlements.plist */; };
+               6C61D3E9242A2C14008AB9BB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               6C6AF17A221A06790091CE0A /* SecDbKeychainSerializedMetadataKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C6AF178221A03930091CE0A /* SecDbKeychainSerializedMetadataKey.proto */; };
+               6C6AF17F221A07090091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */; };
+               6C6AF180221A070A0091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */; };
+               6C6AF181221A070C0091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */; };
+               6C6AF182221A07230091CE0A /* SecDbKeychainSerializedMetadataKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C6AF17D221A06F70091CE0A /* SecDbKeychainSerializedMetadataKey.h */; };
+               6C6AF183221A07240091CE0A /* SecDbKeychainSerializedMetadataKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C6AF17D221A06F70091CE0A /* SecDbKeychainSerializedMetadataKey.h */; };
+               6C6B3AC623F1A820002827C2 /* KeychainEntitlementsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */; };
+               6C6B3ADF23F1B3E0002827C2 /* KeychainAppClipTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C84E3C723ECBC84003C9710 /* KeychainAppClipTests.m */; };
+               6C7094CC2239D21E00C5DAC6 /* SecDbBackupManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */; };

                6C73F48A2006B839003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
                6C73F48B2006B83A003D5D63 /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
                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, ); }; };
                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, ); }; };

+               6C75560624212B4400025D78 /* keychainstasherinterface.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C755603242121F000025D78 /* keychainstasherinterface.m */; };
+               6C7BE2B823C3DD64003BB2CA /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA981D80CC2A00B0A59C /* SecurityTool.c */; };
+               6C7BE2B923C3DD64003BB2CA /* scep.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E231D8085FC00865A7C /* scep.c */; };
+               6C7BE2BA23C3DD64003BB2CA /* trust_update.m in Sources */ = {isa = PBXBuildFile; fileRef = D453C38A1FEC669300DE349B /* trust_update.m */; };
+               6C7BE2BB23C3DD64003BB2CA /* keychain_backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E211D8085FC00865A7C /* keychain_backup.c */; };
+               6C7BE2BC23C3DD64003BB2CA /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA911D80CC2A00B0A59C /* whoami.m */; };
+               6C7BE2BE23C3DD64003BB2CA /* KeychainCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337831FDB29A200E19F30 /* KeychainCheck.m */; };
+               6C7BE2BF23C3DD64003BB2CA /* log_control.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1D1D8085FC00865A7C /* log_control.c */; };
+               6C7BE2C023C3DD64003BB2CA /* not_on_this_platorm.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */; };
+               6C7BE2C123C3DD64003BB2CA /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1A1D8085FC00865A7C /* keychain_util.c */; };
+               6C7BE2C223C3DD64003BB2CA /* security_tool_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = E7104A0B169E171900DB0045 /* security_tool_commands.c */; };
+               6C7BE2C323C3DD64003BB2CA /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1E1D8085FC00865A7C /* codesign.c */; };
+               6C7BE2C523C3DD64003BB2CA /* NSFileHandle+Formatting.m in Sources */ = {isa = PBXBuildFile; fileRef = E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */; };
+               6C7BE2C623C3DD64003BB2CA /* keychain_find.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E201D8085FC00865A7C /* keychain_find.m */; };
+               6C7BE2C723C3DD64003BB2CA /* readline.c in Sources */ = {isa = PBXBuildFile; fileRef = DC65E7BE1D8CBB1500152EF0 /* readline.c */; };
+               6C7BE2C823C3DD64003BB2CA /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1C1D8085FC00865A7C /* add_internet_password.c */; };
+               6C7BE2C923C3DD64003BB2CA /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */; };
+               6C7BE2CA23C3DD64003BB2CA /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA931D80CC2A00B0A59C /* leaks.c */; };
+               6C7BE2CB23C3DD64003BB2CA /* show_certificates.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E251D8085FC00865A7C /* show_certificates.c */; };
+               6C7BE2CC23C3DD64003BB2CA /* spc.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E261D8085FC00865A7C /* spc.c */; };
+               6C7BE2CD23C3DD64003BB2CA /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E191D8085FC00865A7C /* verify_cert.c */; };
+               6C7BE2CE23C3DD64003BB2CA /* ct_exceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */; };
+               6C7BE2CF23C3DD64003BB2CA /* keychain_add.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1F1D8085FC00865A7C /* keychain_add.c */; };
+               6C7BE2D023C3DD64003BB2CA /* pkcs12_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E221D8085FC00865A7C /* pkcs12_util.c */; };
+               6C7BE2D123C3DD64003BB2CA /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
+               6C7BE2D423C3DD64003BB2CA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               6C7BE2D723C3DD64003BB2CA /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               6C7BE2D823C3DD64003BB2CA /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
+               6C7BE2D923C3DD64003BB2CA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
+               6C7BE2DC23C3DD64003BB2CA /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
+               6C7BE2DD23C3DD64003BB2CA /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               6C7BE2E023C3DD64003BB2CA /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               6C7BE2E323C3DD64003BB2CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               6C7BE2EB23C3DDC3003BB2CA /* libsecurityd_bridge.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */; };

                6C7FD5DF1F87FA42002C2285 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                6C814A4C2050B4B600CB391B /* LocalKeychainAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };
                6C7FD5DF1F87FA42002C2285 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                6C814A4C2050B4B600CB391B /* LocalKeychainAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };

-               6C869A761F50CAF500957298 /* SOSEnsureBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C860C7A1F4F63DB004100A1 /* SOSEnsureBackup.m */; };
+               6C880FC821C3351400D38D66 /* SecDbBackupBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC321C334FD00D38D66 /* SecDbBackupBag.m */; };
+               6C880FC921C3351400D38D66 /* SecDbBackupBagIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC621C334FE00D38D66 /* SecDbBackupBagIdentity.m */; };
+               6C880FCA21C3351400D38D66 /* SecDbBackupKeyClassSigningKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC221C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.m */; };
+               6C880FCB21C3351400D38D66 /* SecDbBackupMetadataClassKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC121C334FC00D38D66 /* SecDbBackupMetadataClassKey.m */; };
+               6C880FCC21C3351400D38D66 /* SecDbBackupRecoverySet.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC021C334FC00D38D66 /* SecDbBackupRecoverySet.m */; };
+               6C880FCD21C3351500D38D66 /* SecDbBackupBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC321C334FD00D38D66 /* SecDbBackupBag.m */; };
+               6C880FCE21C3351500D38D66 /* SecDbBackupBagIdentity.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC621C334FE00D38D66 /* SecDbBackupBagIdentity.m */; };
+               6C880FCF21C3351500D38D66 /* SecDbBackupKeyClassSigningKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC221C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.m */; };
+               6C880FD021C3351500D38D66 /* SecDbBackupMetadataClassKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC121C334FC00D38D66 /* SecDbBackupMetadataClassKey.m */; };
+               6C880FD121C3351500D38D66 /* SecDbBackupRecoverySet.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C880FC021C334FC00D38D66 /* SecDbBackupRecoverySet.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 */; };
                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 */; };
-               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 */; };
-               6C98084E1E788AEB00E70590 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
-               6C98084F1E788AEB00E70590 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
-               6C9808501E788AEB00E70590 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
-               6C9808511E788AEB00E70590 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
-               6C9808521E788AEB00E70590 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               6C9808531E788AEB00E70590 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
-               6C9808541E788AEB00E70590 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
-               6C9808551E788AEB00E70590 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
-               6C9808561E788AEB00E70590 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
-               6C9808571E788AEB00E70590 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
-               6C9808581E788AEB00E70590 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
-               6C9808591E788AEB00E70590 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
-               6C98085A1E788AEB00E70590 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.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 */; };
-               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 */; };
-               6C98088A1E788AFD00E70590 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
-               6C98088B1E788AFD00E70590 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
-               6C98088C1E788AFD00E70590 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
-               6C98088D1E788AFD00E70590 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
-               6C98088E1E788AFD00E70590 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               6C98088F1E788AFD00E70590 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
-               6C9808901E788AFD00E70590 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
-               6C9808911E788AFD00E70590 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
-               6C9808921E788AFD00E70590 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
-               6C9808931E788AFD00E70590 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
-               6C9808941E788AFD00E70590 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
-               6C9808951E788AFD00E70590 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
-               6C9808961E788AFD00E70590 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
-               6C9808971E788AFD00E70590 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
-               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 */; };
+               6C912AA0227A3E9600671FC6 /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               6C912AA1227A3E9700671FC6 /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               6C963284242A279B00C53CE2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C963283242A279B00C53CE2 /* main.m */; };
+               6C96328A242A284C00C53CE2 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; };
+               6C97434824D1C8CB00A2025C /* LegacyAPICounts.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C2D463924C88A700015C3C9 /* LegacyAPICounts.h */; };
+               6C97434A24D1C8DE00A2025C /* LegacyAPICounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C2D463B24C88A870015C3C9 /* LegacyAPICounts.m */; };
+               6C9791C821C20CFF0074C609 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               6C9791C921C2EAB60074C609 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               6C9791CB21C325C30074C609 /* SecDbBackupRecoverySet.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6CB6CC022198D4BC0080AD6F /* SecDbBackupRecoverySet.proto */; };

                6C9AA7A11F7C1D9000D08296 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AA7A01F7C1D9000D08296 /* main.m */; };
                6C9AA7A51F7C6F7F00D08296 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
                6CA837642210CA8A002770F1 /* kc-45-change-password.c in Sources */ = {isa = PBXBuildFile; fileRef = 6CA837612210C5E7002770F1 /* kc-45-change-password.c */; };
                6C9AA7A11F7C1D9000D08296 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C9AA7A01F7C1D9000D08296 /* main.m */; };
                6C9AA7A51F7C6F7F00D08296 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
                6CA837642210CA8A002770F1 /* kc-45-change-password.c in Sources */ = {isa = PBXBuildFile; fileRef = 6CA837612210C5E7002770F1 /* kc-45-change-password.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 */; };
+               6CA9690A24ACC2D100C08B5E /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

                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 */; };
                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 */; };
                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 */; };

+               6CB0C5F824ACDB5300479FB4 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };

                6CB420A52051FDD500FF2D44 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6CB5F47B1E402E6700DBF3F0 /* KeychainEntitledTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */; };
                6CB420A52051FDD500FF2D44 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6CB5F47B1E402E6700DBF3F0 /* KeychainEntitledTestRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */; };


@@ -1573,20 +1980,17 @@
                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 */; };
                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 */; };
                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 */; };

+               6CD1DBED21F9281D00D158FB /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               6CD224E623949132001B70FD /* SecDbBackupTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C6579FC2394878700701C8B /* SecDbBackupTestsBase.m */; };
+               6CD8412C23F5D871003DDF34 /* KeychainBackupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CD8412B23F5D871003DDF34 /* KeychainBackupTests.m */; };

                6CDB5FF51FA78D1A00410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
                6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
                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, ); }; };
                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, ); }; };


@@ -1594,13 +1998,9 @@
                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 */; };
                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 */; };
                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 */; };
                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 */; };


@@ -1618,32 +2018,17 @@
                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 */; };
                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 */; };

-               6CF4A0E41E4549F200ECD7B5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0E31E4549F200ECD7B5 /* main.m */; };
-               6CF4A0E71E4549F300ECD7B5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0E61E4549F300ECD7B5 /* AppDelegate.m */; };
-               6CF4A0EA1E4549F300ECD7B5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0E91E4549F300ECD7B5 /* ViewController.m */; };
-               6CFDC4551F907D2600646DBB /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };

                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */; };
                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 */; };
                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E0861DFD015A0021E1B7 /* SOSAccountGetSet.m */; };

-               7281E0881DFD06480021E1B7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

                7281E08D1DFD0B520021E1B7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };
                7281E08F1DFD0DBB0021E1B7 /* secd-210-keyinterest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.m */; };
                7281E0901DFD0E0A0021E1B7 /* CKDKVSProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = E7A5F4C71C0CFF3200F3BEBB /* CKDKVSProxy.m */; };
                7281E0911DFD0E510021E1B7 /* CKDSimulatedStore.m in Sources */ = {isa = PBXBuildFile; fileRef = E7FE40C41DC804E400F0F5B6 /* CKDSimulatedStore.m */; };
                7281E08D1DFD0B520021E1B7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };
                7281E08F1DFD0DBB0021E1B7 /* secd-210-keyinterest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.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 */; };

                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 */; };
                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 */; };

+               78ADC62B1FA0FACD001EB8B6 /* SecProtocolTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 78ADC6251FA0FAC5001EB8B6 /* SecProtocolTypes.m */; };
+               78ADC62C1FA0FACE001EB8B6 /* SecProtocolTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 78ADC6251FA0FAC5001EB8B6 /* SecProtocolTypes.m */; };

                78F92F11195128D70023B54B /* SecECKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 78F92F10195128D70023B54B /* SecECKeyPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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, ); }; };
-               7901791A12D51F7200CA4D44 /* SecCmsDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791012D51F7200CA4D44 /* SecCmsDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901791B12D51F7200CA4D44 /* SecCmsDigestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791112D51F7200CA4D44 /* SecCmsDigestContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901791C12D51F7200CA4D44 /* SecCmsEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791212D51F7200CA4D44 /* SecCmsEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901791D12D51F7200CA4D44 /* SecCmsEnvelopedData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791312D51F7200CA4D44 /* SecCmsEnvelopedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901791E12D51F7200CA4D44 /* SecCmsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791412D51F7200CA4D44 /* SecCmsMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901791F12D51F7200CA4D44 /* SecCmsRecipientInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791512D51F7200CA4D44 /* SecCmsRecipientInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901792012D51F7200CA4D44 /* SecCmsSignedData.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791612D51F7200CA4D44 /* SecCmsSignedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               7901792112D51F7200CA4D44 /* SecCmsSignerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7901791712D51F7200CA4D44 /* SecCmsSignerInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };

                790850F70CA88AE10083CC4D /* securityd_client.h in Headers */ = {isa = PBXBuildFile; fileRef = 790850820CA87CF00083CC4D /* securityd_client.h */; };
                790851D40CA9B19D0083CC4D /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
                790851EE0CA9B3410083CC4D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                790850F70CA88AE10083CC4D /* securityd_client.h in Headers */ = {isa = PBXBuildFile; fileRef = 790850820CA87CF00083CC4D /* securityd_client.h */; };
                790851D40CA9B19D0083CC4D /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
                790851EE0CA9B3410083CC4D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };


@@ -1662,7 +2047,6 @@
                79679E2A146202A800CF997F /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };
                79679E2C146202CB00CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigicertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E251462028800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt */; };
                79679E2D146202CB00CF997F /* Invalid-webmail.jaring.my.crt in Copy DigicertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };
                79679E2A146202A800CF997F /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };
                79679E2C146202CB00CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigicertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E251462028800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt */; };
                79679E2D146202CB00CF997F /* Invalid-webmail.jaring.my.crt in Copy DigicertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };

-               79BDD3C20D60DB84000D84D3 /* SecCMS.h in Headers */ = {isa = PBXBuildFile; fileRef = 79BDD3C00D60DB84000D84D3 /* SecCMS.h */; settings = {ATTRIBUTES = (Private, ); }; };

                79EF5B6E0D3D6A31009F5270 /* SecImportExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */; settings = {ATTRIBUTES = (Public, ); }; };
                79EF5B730D3D6AFE009F5270 /* p12import.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EF5B720D3D6AFE009F5270 /* p12import.h */; };
                8E02FA6B1107BE460043545E /* pbkdf2.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E02FA691107BE460043545E /* pbkdf2.h */; settings = {ATTRIBUTES = (Private, ); }; };
                79EF5B6E0D3D6A31009F5270 /* SecImportExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */; settings = {ATTRIBUTES = (Public, ); }; };
                79EF5B730D3D6AFE009F5270 /* p12import.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EF5B720D3D6AFE009F5270 /* p12import.h */; };
                8E02FA6B1107BE460043545E /* pbkdf2.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E02FA691107BE460043545E /* pbkdf2.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -1670,12 +2054,32 @@
                A690B033208A75D1002FB775 /* notarization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6B1BA78207BD9D400F1E099 /* notarization.cpp */; };
                A6B1BA81207BD9EC00F1E099 /* notarization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6B1BA78207BD9D400F1E099 /* notarization.cpp */; };
                A6B1BA82207BDCB200F1E099 /* notarization.h in Headers */ = {isa = PBXBuildFile; fileRef = A6B1BA79207BD9D400F1E099 /* notarization.h */; };
                A690B033208A75D1002FB775 /* notarization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6B1BA78207BD9D400F1E099 /* notarization.cpp */; };
                A6B1BA81207BD9EC00F1E099 /* notarization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6B1BA78207BD9D400F1E099 /* notarization.cpp */; };
                A6B1BA82207BDCB200F1E099 /* notarization.h in Headers */ = {isa = PBXBuildFile; fileRef = A6B1BA79207BD9D400F1E099 /* notarization.h */; };

-               AA44E0D520325150001EA371 /* SecProtocol.c in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0D02032513F001EA371 /* SecProtocol.c */; };
-               AA44E0D620325150001EA371 /* SecProtocol.c in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0D02032513F001EA371 /* SecProtocol.c */; };
-               AA44E0D72032515C001EA371 /* SecProtocolTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0D120325140001EA371 /* SecProtocolTypes.m */; };
-               AA44E0D82032515C001EA371 /* SecProtocolTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0D120325140001EA371 /* SecProtocolTypes.m */; };
-               AA44E0DE2032519E001EA371 /* SecProtocolPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = AA44E0D920325177001EA371 /* SecProtocolPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               AA44E0DF2032519F001EA371 /* SecProtocolPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = AA44E0D920325177001EA371 /* SecProtocolPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A6BC648824897C5E00A21CD7 /* CSCommonPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787441D7790A500B50D50 /* CSCommonPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A6BC6491248B0AB400A21CD7 /* SecStaticCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17874C1D7790A500B50D50 /* SecStaticCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A6BF3B3623EB95F0009AF079 /* entitlements.h in Headers */ = {isa = PBXBuildFile; fileRef = A6BF3B3123EB94A7009AF079 /* entitlements.h */; };
+               A6C737B923F37A480009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               A6C737BA23F37A4B0009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               A6C737BB23F37AB00009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               A6C737BD23F37AB20009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               A6C737C023F37AB90009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               A6C737C123F37AC00009C930 /* entitlements.c in Sources */ = {isa = PBXBuildFile; fileRef = A6BF3B3223EB94A7009AF079 /* entitlements.c */; };
+               AA0DA47A21E818AB009F1C74 /* builtins.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA0DA47921E8189E009F1C74 /* builtins.json */; };
+               AA0DA47B21E818AB009F1C74 /* example1.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA0DA47821E8189D009F1C74 /* example1.json */; };
+               AA0DA47D21E818D2009F1C74 /* builtins.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA0DA47921E8189E009F1C74 /* builtins.json */; };
+               AA0DA47E21E818D2009F1C74 /* example1.json in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA0DA47821E8189D009F1C74 /* example1.json */; };
+               AA15CB4D2076C5A900C1A978 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               AA15CB4F2076C9D500C1A978 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               AA44E0B5202E355C001EA371 /* SecProtocolTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AA44E0B3202E3451001EA371 /* SecProtocolTest.m */; };
+               AA5B12192164671000A6AB81 /* SecProtocolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FD5982152AFC00045A07A /* SecProtocolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               AA5B121C2164671000A6AB81 /* SecProtocolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9FD5982152AFC00045A07A /* SecProtocolConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               AA7C71B62185429800EB314F /* SecProtocolTypesPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE91C542162634200B6BF0B /* SecProtocolTypesPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               AA7C71B72185429900EB314F /* SecProtocolTypesPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE91C542162634200B6BF0B /* SecProtocolTypesPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               AA9FD59C2152AFD70045A07A /* SecProtocolConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = AA9FD59B2152AFD70045A07A /* SecProtocolConfiguration.m */; };
+               AA9FD59D2152AFE30045A07A /* SecProtocolConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = AA9FD59B2152AFD70045A07A /* SecProtocolConfiguration.m */; };
+               AAA5FC7E21664D1D00B52A48 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 475EDCD420D98934009D2409 /* Security.framework */; };
+               AAD6630A203362490073E17B /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD66304203362480073E17B /* libnetwork.tbd */; };
+               AAD6630B203362500073E17B /* libnetwork.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AAD66304203362480073E17B /* libnetwork.tbd */; };
+               AADD4A2D215E83270054FC6D /* SecProtocolConfigurationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AADD4A2B215E83140054FC6D /* SecProtocolConfigurationTest.m */; };

                ACBAF6EE1E941AE00007BA2F /* transform_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACBAF6E31E941AE00007BA2F /* transform_regressions.h */; };
                ACBAF6EF1E941AE00007BA2F /* transform_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACBAF6E31E941AE00007BA2F /* transform_regressions.h */; };
                ACBAF6F91E941B020007BA2F /* transform-01-sigverify.m in Sources */ = {isa = PBXBuildFile; fileRef = ACBAF6E51E941AE00007BA2F /* transform-01-sigverify.m */; };
                ACBAF6EE1E941AE00007BA2F /* transform_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACBAF6E31E941AE00007BA2F /* transform_regressions.h */; };
                ACBAF6EF1E941AE00007BA2F /* transform_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = ACBAF6E31E941AE00007BA2F /* transform_regressions.h */; };
                ACBAF6F91E941B020007BA2F /* transform-01-sigverify.m in Sources */ = {isa = PBXBuildFile; fileRef = ACBAF6E51E941AE00007BA2F /* transform-01-sigverify.m */; };


@@ -1694,19 +2098,11 @@
                BE197F5B1911723E00BA91D1 /* SpringBoardUIServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE197F5A1911723E00BA91D1 /* SpringBoardUIServices.framework */; };
                BE197F5C1911724900BA91D1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE411314471B000DE34E /* UIKit.framework */; };
                BE197F5E191173A800BA91D1 /* SWCViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE197F5D191173A800BA91D1 /* SWCViewController.m */; };
                BE197F5B1911723E00BA91D1 /* SpringBoardUIServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE197F5A1911723E00BA91D1 /* SpringBoardUIServices.framework */; };
                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 */; };

                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 */; };
                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 */; };
                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 */; };


@@ -1719,43 +2115,92 @@
                BE4AC9A218B7FFAD00B84964 /* swcagent.m in Sources */ = {isa = PBXBuildFile; fileRef = BE4AC9A118B7FFAD00B84964 /* swcagent.m */; };
                BE4AC9AE18B7FFC800B84964 /* com.apple.security.swcagent.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = BE4AC9AD18B7FFC800B84964 /* com.apple.security.swcagent.plist */; };
                BE4AC9BA18B8273600B84964 /* SharedWebCredentials.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE4AC9B818B8273600B84964 /* SharedWebCredentials.strings */; };
                BE4AC9A218B7FFAD00B84964 /* swcagent.m in Sources */ = {isa = PBXBuildFile; fileRef = BE4AC9A118B7FFAD00B84964 /* swcagent.m */; };
                BE4AC9AE18B7FFC800B84964 /* com.apple.security.swcagent.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = BE4AC9AD18B7FFC800B84964 /* com.apple.security.swcagent.plist */; };
                BE4AC9BA18B8273600B84964 /* SharedWebCredentials.strings in Resources */ = {isa = PBXBuildFile; fileRef = BE4AC9B818B8273600B84964 /* SharedWebCredentials.strings */; };

+               BE4C6AB820CAF4F700EAD6BE /* ContainerSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE4C6AB120CAF4E500EAD6BE /* ContainerSync.swift */; };
+               BE536019209BB76B0027E25A /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; };
+               BE53601A209BB7F80027E25A /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               BE53601B209BB8390027E25A /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               BE53602D209BBF630027E25A /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               BE536030209BC1FD0027E25A /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               BE536031209BC2F90027E25A /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               BE536032209BC3250027E25A /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               BE536033209BC3B30027E25A /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               BE536034209BC3C40027E25A /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               BE55C77C2044D0C90045863D /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE55C77B2044D0C90045863D /* Client.swift */; };
+               BE55C77E2044D7E60045863D /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE55C77D2044D7E60045863D /* main.swift */; };
+               BE57B1182509E1000045B7FD /* ca_revocation_additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */; };
+               BE57B1192509E1000045B7FD /* ca_revocation_additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */; };
+               BE57B11A2509E1000045B7FD /* ca_revocation_additions.m in Sources */ = {isa = PBXBuildFile; fileRef = BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */; };

                BE61F5AF1EB0060C00556CCF /* TrustedPeers.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C641EB0005F00357577 /* TrustedPeers.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BE61F5AF1EB0060C00556CCF /* TrustedPeers.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C641EB0005F00357577 /* TrustedPeers.h */; settings = {ATTRIBUTES = (Public, ); }; };

-               BE6215BE1DB6E69100961E15 /* si-84-sectrust-allowlist.m in Sources */ = {isa = PBXBuildFile; fileRef = BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */; };
+               BE64A7FA22AF006F001209F3 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */; };
+               BE64A7FC22AF008D001209F3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };
+               BE64A80022AF010B001209F3 /* trusted_cert_ssl.m in Sources */ = {isa = PBXBuildFile; fileRef = BE64A7FE22AF010A001209F3 /* trusted_cert_ssl.m */; };
+               BE70899D1F9AB03E001ACC20 /* TPPBVoucher.h in Headers */ = {isa = PBXBuildFile; fileRef = BE70899A1F9AAFF7001ACC20 /* TPPBVoucher.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BE727824209CBCA800F0DA77 /* Cuttlefish.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */; };
+               BE72782B209D27C800F0DA77 /* TPKeyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BE72782A209D27C800F0DA77 /* TPKeyTests.m */; };
+               BE72782C209D2C1400F0DA77 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };

                BE759DCB1917E38D00801E02 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE451314471B000DE34E /* CoreGraphics.framework */; };
                BE759DCB1917E38D00801E02 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE451314471B000DE34E /* CoreGraphics.framework */; };

+               BE7B8E132415579900E1CF4F /* SecSharedCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7B8E112415579800E1CF4F /* SecSharedCredential.m */; };
+               BE7B8E142415579900E1CF4F /* SecSharedCredential.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7B8E112415579800E1CF4F /* SecSharedCredential.m */; };
+               BE7B8E152415580D00E1CF4F /* SecSharedCredential.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8C1D8085FC00865A7C /* SecSharedCredential.c */; };

                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                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 */; };
-               BEB9EA301FFF1B0800676593 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BEB9EA2E1FFF1AF600676593 /* si-88-sectrust-valid-data */; };
+               BE92249E204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */; };
+               BE9F4F8C2072D881004A52C2 /* Cuttlefish.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */; };
+               BE9F8D10206C099800B53D16 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D0F206C099800B53D16 /* Container.swift */; };
+               BE9F8D12206C121400B53D16 /* Decrypter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D11206C121400B53D16 /* Decrypter.swift */; };
+               BE9F8D15206C2E0200B53D16 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               BE9F8D19206C4AD300B53D16 /* ContainerMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */; };
+               BEA8558120B5DC7D00D5AD11 /* FakeCuttlefish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA8557F20B5DC7D00D5AD11 /* FakeCuttlefish.swift */; };
+               BEAA0046202B785000E51F45 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               BEB0B06E1FE9E81D007E6A83 /* TPPBPeerDynamicInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BE7089CF1FA3BA01001ACC20 /* TPPBPeerDynamicInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEB0B06F1FE9E850007E6A83 /* TPPBPeerPermanentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BE7089DD1FA40B93001ACC20 /* TPPBPeerPermanentInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEB0B0701FE9E8F6007E6A83 /* TPPBPeerStableInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BE7089D41FA3BA04001ACC20 /* TPPBPeerStableInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BEB0B0711FE9E936007E6A83 /* TPPBPolicySecret.h in Headers */ = {isa = PBXBuildFile; fileRef = BE7089D31FA3BA03001ACC20 /* TPPBPolicySecret.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEB49F30206E98D0008DA7F4 /* TPECPublicKeyFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB49F29206E98CD008DA7F4 /* TPECPublicKeyFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEB49F31206E98D0008DA7F4 /* TPECPublicKeyFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB49F2F206E98CE008DA7F4 /* TPECPublicKeyFactory.m */; };
+               BEB49F34206E9A1A008DA7F4 /* SFKey+TPKey.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB49F32206E9A18008DA7F4 /* SFKey+TPKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEB49F35206E9A1A008DA7F4 /* SFKey+TPKey.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB49F33206E9A19008DA7F4 /* SFKey+TPKey.m */; };
+               BEB49F37206E9B8B008DA7F4 /* TPECPublicKeyFactoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB49F36206E9B89008DA7F4 /* TPECPublicKeyFactoryTests.m */; };
+               BEC0A96420B362EC00DBD772 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC0A96320B362EC00DBD772 /* Utils.swift */; };
+               BEC0A96520B362EC00DBD772 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC0A96320B362EC00DBD772 /* Utils.swift */; };
+               BEC373A420CF3B5D00DBDF5B /* TPPBDisposition.h in Headers */ = {isa = PBXBuildFile; fileRef = BEC373A220CF3B5C00DBDF5B /* TPPBDisposition.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEC373B220D815F500DBDF5B /* TPPBUnknownMachineID.h in Headers */ = {isa = PBXBuildFile; fileRef = BEC373B120D815E400DBDF5B /* TPPBUnknownMachineID.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEC373B320D815FB00DBDF5B /* TPPBPolicyProhibits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEC373B020D815E300DBDF5B /* TPPBPolicyProhibits.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEC373B420D8160100DBDF5B /* TPPBAncientEpoch.h in Headers */ = {isa = PBXBuildFile; fileRef = BEC373AF20D815E200DBDF5B /* TPPBAncientEpoch.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEC373CB20D822DA00DBDF5B /* TPPBDispositionEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = BEC373CA20D822CE00DBDF5B /* TPPBDispositionEntry.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BEC373D020D87B4D00DBDF5B /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
+               BEC6A9162331992900080069 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEC6A9142331992800080069 /* Network.framework */; };
+               BECEC11220A508F600E97255 /* TPVoucher.h in Headers */ = {isa = PBXBuildFile; fileRef = BECEC11020A508F600E97255 /* TPVoucher.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BECEC11320A508F600E97255 /* TPVoucher.m in Sources */ = {isa = PBXBuildFile; fileRef = BECEC11120A508F600E97255 /* TPVoucher.m */; };
+               BECEC11C20A634E000E97255 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; };
+               BECFA43120F91AFE00B11002 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BECFA43020F91AFE00B11002 /* main.m */; };
+               BECFA43A20F91B8300B11002 /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               BECFA43B20F91CE500B11002 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; };
+               BECFA43D20F9493000B11002 /* Policy.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECFA43C20F9493000B11002 /* Policy.swift */; };
+               BECFA43E20F9493000B11002 /* Policy.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECFA43C20F9493000B11002 /* Policy.swift */; };
+               BECFA44320FD0A4B00B11002 /* LocalKeychainAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */; };
+               BECFA45920FEB90900B11002 /* Policy.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECFA43C20F9493000B11002 /* Policy.swift */; };
+               BECFA46420FFB87500B11002 /* TPKey.m in Sources */ = {isa = PBXBuildFile; fileRef = BECFA46320FFB87400B11002 /* TPKey.m */; };
+               BED079D22542A2C100FED203 /* CARevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BED078F82542A2BF00FED203 /* CARevocationTests.m */; };
+               BED07AAC2542A2CC00FED203 /* CARevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BED078F82542A2BF00FED203 /* CARevocationTests.m */; };
+               BED07B862542A2CE00FED203 /* CARevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BED078F82542A2BF00FED203 /* CARevocationTests.m */; };

                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 */; };
                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 */; };
+               BED987D62099145300607A5F /* TrustedPeersHelperUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BED987D52099145300607A5F /* TrustedPeersHelperUnitTests.swift */; };
+               BED987D82099145300607A5F /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               BED987DE2099156B00607A5F /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D0F206C099800B53D16 /* Container.swift */; };
+               BED987DF209918A500607A5F /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               BED987E020991B1100607A5F /* TrustedPeersHelper.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */; };
+               BED987E120991B9B00607A5F /* Decrypter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D11206C121400B53D16 /* Decrypter.swift */; };
+               BED987E320991C4D00607A5F /* MockCuttlefish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BED987E220991C4D00607A5F /* MockCuttlefish.swift */; };

                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 */; };
                BEEB47DA1EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */ = {isa = PBXBuildFile; fileRef = BEEB47D71EA189F5004AA5C6 /* SecTrustStatusCodes.c */; };
                BEEB47DB1EA189F5004AA5C6 /* SecTrustStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEB47D81EA189F5004AA5C6 /* SecTrustStatusCodes.h */; };
                BEEB47DC1EA189F5004AA5C6 /* SecTrustStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEB47D81EA189F5004AA5C6 /* SecTrustStatusCodes.h */; };
                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 */; };
                BEEB47DA1EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */ = {isa = PBXBuildFile; fileRef = BEEB47D71EA189F5004AA5C6 /* SecTrustStatusCodes.c */; };
                BEEB47DB1EA189F5004AA5C6 /* SecTrustStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEB47D81EA189F5004AA5C6 /* SecTrustStatusCodes.h */; };
                BEEB47DC1EA189F5004AA5C6 /* SecTrustStatusCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEB47D81EA189F5004AA5C6 /* SecTrustStatusCodes.h */; };

-               BEF88C311EAFFC3F00357577 /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };

                BEF88C771EB000BE00357577 /* TPCategoryRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C481EB0005E00357577 /* TPCategoryRule.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C781EB000BE00357577 /* TPCategoryRule.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C491EB0005E00357577 /* TPCategoryRule.m */; };
                BEF88C771EB000BE00357577 /* TPCategoryRule.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C481EB0005E00357577 /* TPCategoryRule.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C781EB000BE00357577 /* TPCategoryRule.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C491EB0005E00357577 /* TPCategoryRule.m */; };

-               BEF88C791EB000BE00357577 /* TPCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4A1EB0005E00357577 /* TPCircle.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               BEF88C7A1EB000BE00357577 /* TPCircle.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C4B1EB0005E00357577 /* TPCircle.m */; };

                BEF88C7B1EB000BE00357577 /* TPDecrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4C1EB0005E00357577 /* TPDecrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C7C1EB000BE00357577 /* TPEncrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4D1EB0005E00357577 /* TPEncrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C7D1EB000BE00357577 /* TPHash.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4E1EB0005E00357577 /* TPHash.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C7B1EB000BE00357577 /* TPDecrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4C1EB0005E00357577 /* TPDecrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C7C1EB000BE00357577 /* TPEncrypter.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4D1EB0005E00357577 /* TPEncrypter.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C7D1EB000BE00357577 /* TPHash.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C4E1EB0005E00357577 /* TPHash.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -1774,13 +2219,8 @@
                BEF88C8A1EB000BE00357577 /* TPPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C5B1EB0005E00357577 /* TPPolicy.m */; };
                BEF88C8B1EB000BE00357577 /* TPPolicyDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C8C1EB000BE00357577 /* TPPolicyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */; };
                BEF88C8A1EB000BE00357577 /* TPPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C5B1EB0005E00357577 /* TPPolicy.m */; };
                BEF88C8B1EB000BE00357577 /* TPPolicyDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C8C1EB000BE00357577 /* TPPolicyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */; };

-               BEF88C8D1EB000BE00357577 /* TPSigningKey.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5E1EB0005E00357577 /* TPSigningKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               BEF88C8D1EB000BE00357577 /* TPKey.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5E1EB0005E00357577 /* TPKey.h */; settings = {ATTRIBUTES = (Public, ); }; };

                BEF88C8E1EB000BE00357577 /* TPTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5F1EB0005E00357577 /* TPTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BEF88C8E1EB000BE00357577 /* TPTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C5F1EB0005E00357577 /* TPTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };

-               BEF88C8F1EB000BE00357577 /* TPUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C601EB0005E00357577 /* TPUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               BEF88C901EB000BE00357577 /* TPUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C611EB0005E00357577 /* TPUtils.m */; };
-               BEF88C911EB000BE00357577 /* TPVoucher.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF88C621EB0005E00357577 /* TPVoucher.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               BEF88C921EB000BE00357577 /* TPVoucher.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C631EB0005F00357577 /* TPVoucher.m */; };
-               BEF88C931EB000FD00357577 /* TPCircleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C671EB0008E00357577 /* TPCircleTests.m */; };

                BEF88C941EB000FD00357577 /* TPDummyDecrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */; };
                BEF88C951EB000FD00357577 /* TPDummyEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C6B1EB0008E00357577 /* TPDummyEncrypter.m */; };
                BEF88C961EB000FD00357577 /* TPDummySigningKey.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C6D1EB0008E00357577 /* TPDummySigningKey.m */; };
                BEF88C941EB000FD00357577 /* TPDummyDecrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */; };
                BEF88C951EB000FD00357577 /* TPDummyEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C6B1EB0008E00357577 /* TPDummyEncrypter.m */; };
                BEF88C961EB000FD00357577 /* TPDummySigningKey.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C6D1EB0008E00357577 /* TPDummySigningKey.m */; };


@@ -1790,8 +2230,6 @@
                BEF88C9A1EB000FD00357577 /* TPPeerStableInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */; };
                BEF88C9B1EB000FD00357577 /* TPPeerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C731EB0008E00357577 /* TPPeerTests.m */; };
                BEF88C9C1EB000FD00357577 /* TPPolicyDocumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */; };
                BEF88C9A1EB000FD00357577 /* TPPeerStableInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */; };
                BEF88C9B1EB000FD00357577 /* TPPeerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C731EB0008E00357577 /* TPPeerTests.m */; };
                BEF88C9C1EB000FD00357577 /* TPPolicyDocumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */; };

-               BEF88C9D1EB000FD00357577 /* TPUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C751EB0008E00357577 /* TPUtilsTests.m */; };
-               BEF88C9E1EB000FD00357577 /* TPVoucherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF88C761EB0008E00357577 /* TPVoucherTests.m */; };

                CD112FC51DDA31AD00C77A07 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
                CD198F971DE27B9E00F6FB83 /* SOSAccountPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9021471DE27A9E00F81DC4 /* SOSAccountPriv.h */; };
                CD791B3C1DFC9A7600F0E5DC /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */; };
                CD112FC51DDA31AD00C77A07 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
                CD198F971DE27B9E00F6FB83 /* SOSAccountPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = CD9021471DE27A9E00F81DC4 /* SOSAccountPriv.h */; };
                CD791B3C1DFC9A7600F0E5DC /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */; };


@@ -1799,25 +2237,41 @@
                CD9F2AF81DF23CA600AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                CD9F2AF91DF249B400AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                CD9F2AFA1DF249CF00AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                CD9F2AF81DF23CA600AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                CD9F2AF91DF249B400AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                CD9F2AFA1DF249CF00AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

-               CD9F2AFB1DF24BAF00AD3577 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

                CDB9FCAB179CD098000AAD66 /* Info.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = CDB9FCA9179CC757000AAD66 /* Info.plist */; };
                CDDE9BD11729ABFA0013B0E8 /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CDB9FCAB179CD098000AAD66 /* Info.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = CDB9FCA9179CC757000AAD66 /* Info.plist */; };
                CDDE9BD11729ABFA0013B0E8 /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */; settings = {ATTRIBUTES = (Private, ); }; };

+               D401E8B420A26F1F00CD8BB4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; };
+               D4056A1A22712A650026E24E /* SSLPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4056A1922712A650026E24E /* SSLPolicyTests.m */; };
+               D4056A1B22712A650026E24E /* SSLPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4056A1922712A650026E24E /* SSLPolicyTests.m */; };
+               D4056A1F22712D750026E24E /* ssl-policy-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4056A1D22712D740026E24E /* ssl-policy-certs */; };
+               D4056A2022712D750026E24E /* ssl-policy-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4056A1D22712D740026E24E /* ssl-policy-certs */; };
+               D40881EF2175731E00180E81 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };
+               D40881F02175732600180E81 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
+               D40881F12175732E00180E81 /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E381D8085FC00865A7C /* SecCertificate.c */; };
+               D40881F22175733500180E81 /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */; };
+               D40881F32175733F00180E81 /* SecPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7E1D8085FC00865A7C /* SecPolicy.c */; };
+               D40881F42175738C00180E81 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.c */; };
+               D40881F5217573C900180E81 /* SecTrustStatusCodes.c in Sources */ = {isa = PBXBuildFile; fileRef = BEEB47D71EA189F5004AA5C6 /* SecTrustStatusCodes.c */; };
+               D40881F6217573D500180E81 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };
+               D40881F7217573E000180E81 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
+               D40881F8217573E700180E81 /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E381D8085FC00865A7C /* SecCertificate.c */; };
+               D40881F9217573EF00180E81 /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */; };
+               D40881FA217573F800180E81 /* SecPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7E1D8085FC00865A7C /* SecPolicy.c */; };
+               D40881FB217573F800180E81 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.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 */; };
                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 */; };

-               D40B6A831E2B5F5B00CD6EE5 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               D40B6A831E2B5F5B00CD6EE5 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                D40B6A8D1E2B63D900CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A8F1E2B643D00CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A901E2B673500CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                D40B6A971E2B684900CD6EE5 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */; };
                D40B6A8D1E2B63D900CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A8F1E2B643D00CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A901E2B673500CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                D40B6A971E2B684900CD6EE5 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */; };

-               D40B6A981E2B687F00CD6EE5 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };

                D40B6A991E2B68A400CD6EE5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                D40B6A9A1E2B68E800CD6EE5 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                D40B6A9B1E2B690E00CD6EE5 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                D40B6A991E2B68A400CD6EE5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                D40B6A9A1E2B68E800CD6EE5 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                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 */; };
                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };

+               D40B7CA021605BF800AC9A75 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (Required, ); }; };

                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 */; };
                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 */; };


@@ -1834,9 +2288,79 @@
                D418CC701E690CAD00330A44 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; };
                D418CC711E690CBC00330A44 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; };
                D41D36711EB14D87007FA978 /* libDiagnosticMessagesClient.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */; };
                D418CC701E690CAD00330A44 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; };
                D418CC711E690CBC00330A44 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; };
                D41D36711EB14D87007FA978 /* libDiagnosticMessagesClient.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */; };

+               D423114323725F9F000E470A /* SMIMEPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D423114223725F9F000E470A /* SMIMEPolicyTests.m */; };
+               D423114423725F9F000E470A /* SMIMEPolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D423114223725F9F000E470A /* SMIMEPolicyTests.m */; };
+               D4231148237261F8000E470A /* SMIMEPolicyTests-data in Resources */ = {isa = PBXBuildFile; fileRef = D4231147237261F7000E470A /* SMIMEPolicyTests-data */; };
+               D4231149237261F8000E470A /* SMIMEPolicyTests-data in Resources */ = {isa = PBXBuildFile; fileRef = D4231147237261F7000E470A /* SMIMEPolicyTests-data */; };

                D425EC1D1DD3C3CF00DE5DEC /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };
                D425EC231DD3FFF200DE5DEC /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };
                D425EC1D1DD3C3CF00DE5DEC /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };
                D425EC231DD3FFF200DE5DEC /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };

+               D4267BD123440F8900B54678 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
+               D4267BD323440F9900B54678 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
+               D42C837C21158ACC008D3D83 /* cmscinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8521158AAC00E76E1A /* cmscinfo.c */; };
+               D42C837D21158ACC008D3D83 /* cmsdigest.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8821158AAE00E76E1A /* cmsdigest.c */; };
+               D42C837E21158ACC008D3D83 /* cmsencode.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8A21158AAF00E76E1A /* cmsencode.c */; };
+               D42C837F21158ACC008D3D83 /* cmsreclist.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8921158AAE00E76E1A /* cmsreclist.c */; };
+               D42C838021158ACC008D3D83 /* cmssiginfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8621158AAD00E76E1A /* cmssiginfo.c */; };
+               D42C838121158ACC008D3D83 /* crypto-embedded.c in Sources */ = {isa = PBXBuildFile; fileRef = D44D1F8421158AAC00E76E1A /* crypto-embedded.c */; };
+               D42C838921158B4E008D3D83 /* SecAsn1Item.c in Sources */ = {isa = PBXBuildFile; fileRef = D42C838821158B40008D3D83 /* SecAsn1Item.c */; };
+               D42C838A21158B90008D3D83 /* libCMS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D44D1F662115893000E76E1A /* libCMS.a */; };
+               D42C838B21158EF4008D3D83 /* libCMS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D44D1F662115893000E76E1A /* libCMS.a */; };
+               D42C839C21159170008D3D83 /* CMSEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D42C8393211590D7008D3D83 /* CMSEncoder.cpp */; };
+               D42C839D21159170008D3D83 /* CMSUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D42C8392211590D7008D3D83 /* CMSUtils.cpp */; };
+               D42C839E21159170008D3D83 /* CMSDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D42C8390211590BC008D3D83 /* CMSDecoder.cpp */; };
+               D42C839F211593D8008D3D83 /* libsecurity_cms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D42C839821159146008D3D83 /* libsecurity_cms.a */; };

                D42CDC351DC12FE90090E2C9 /* si-66-smime.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DEB1D8085FC00865A7C /* si-66-smime.c */; };
                D42CDC351DC12FE90090E2C9 /* si-66-smime.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DEB1D8085FC00865A7C /* si-66-smime.c */; };

+               D437185F211671A500EA350A /* cms-01-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = D437185C211671A300EA350A /* cms-01-basic.c */; };
+               D4371860211671A500EA350A /* smime-cms-test.c in Sources */ = {isa = PBXBuildFile; fileRef = D437185D211671A400EA350A /* smime-cms-test.c */; };
+               D4371861211671A500EA350A /* cms-01-basic.h in Headers */ = {isa = PBXBuildFile; fileRef = D437185E211671A400EA350A /* cms-01-basic.h */; };
+               D4371869211682D800EA350A /* cmscipher.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371862211682D500EA350A /* cmscipher.c */; };
+               D437186A211682D800EA350A /* cmsarray.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371863211682D500EA350A /* cmsarray.c */; };
+               D437186B211682D800EA350A /* cmsattr.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371864211682D600EA350A /* cmsattr.c */; };
+               D437186C211682D800EA350A /* cmsasn1.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371865211682D600EA350A /* cmsasn1.c */; };
+               D437186D211682D800EA350A /* cmscinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371866211682D600EA350A /* cmscinfo.c */; };
+               D437186E211682D800EA350A /* cert.c in Sources */ = {isa = PBXBuildFile; fileRef = D4371867211682D700EA350A /* cert.c */; };
+               D437186F211682D800EA350A /* cert.h in Headers */ = {isa = PBXBuildFile; fileRef = D4371868211682D700EA350A /* cert.h */; };
+               D43718782116831A00EA350A /* cmsdigest.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718702116831600EA350A /* cmsdigest.c */; };
+               D43718792116831A00EA350A /* cmsenvdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718712116831600EA350A /* cmsenvdata.c */; };
+               D437187A2116831A00EA350A /* cmsdecode.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718722116831700EA350A /* cmsdecode.c */; };
+               D437187B2116831A00EA350A /* cmsmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718732116831700EA350A /* cmsmessage.c */; };
+               D437187C2116831A00EA350A /* cmsencode.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718742116831800EA350A /* cmsencode.c */; };
+               D437187D2116831A00EA350A /* cmsencdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718752116831900EA350A /* cmsencdata.c */; };
+               D437187E2116831A00EA350A /* cmslocal.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718762116831900EA350A /* cmslocal.h */; };
+               D437187F2116831A00EA350A /* cmsdigdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718772116831A00EA350A /* cmsdigdata.c */; };
+               D43718882116834400EA350A /* cmsreclist.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718802116834000EA350A /* cmsreclist.c */; };
+               D43718892116834400EA350A /* cmsreclist.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718812116834000EA350A /* cmsreclist.h */; };
+               D437188A2116834400EA350A /* cmspriv.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718822116834100EA350A /* cmspriv.h */; };
+               D437188B2116834400EA350A /* cmssiginfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718832116834100EA350A /* cmssiginfo.c */; };
+               D437188C2116834400EA350A /* cmssigdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718842116834200EA350A /* cmssigdata.c */; };
+               D437188D2116834400EA350A /* cmstpriv.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718852116834300EA350A /* cmstpriv.h */; };
+               D437188E2116834400EA350A /* cmsrecinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718862116834300EA350A /* cmsrecinfo.c */; };
+               D437188F2116834400EA350A /* cmspubkey.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718872116834400EA350A /* cmspubkey.c */; };
+               D43718992116836300EA350A /* secalgid.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718902116835E00EA350A /* secalgid.c */; };
+               D437189A2116836300EA350A /* cryptohi.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718912116835E00EA350A /* cryptohi.h */; };
+               D437189B2116836300EA350A /* secitem.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718922116835F00EA350A /* secitem.c */; };
+               D437189C2116836300EA350A /* cryptohi.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718932116836000EA350A /* cryptohi.c */; };
+               D437189D2116836300EA350A /* plhash.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718942116836000EA350A /* plhash.h */; };
+               D437189E2116836300EA350A /* plhash.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718952116836100EA350A /* plhash.c */; };
+               D437189F2116836300EA350A /* SecCMS.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718962116836200EA350A /* SecCMS.c */; };
+               D43718A02116836300EA350A /* secitem.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718972116836200EA350A /* secitem.h */; };
+               D43718A12116836300EA350A /* cmsutil.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718982116836300EA350A /* cmsutil.c */; };
+               D43718A82116839300EA350A /* siginfoUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D43718A22116838F00EA350A /* siginfoUtils.cpp */; };
+               D43718A92116839300EA350A /* secoidt.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718A32116839000EA350A /* secoidt.h */; };
+               D43718AA2116839300EA350A /* secoid.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718A42116839000EA350A /* secoid.c */; };
+               D43718AB2116839300EA350A /* secoid.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718A52116839100EA350A /* secoid.h */; };
+               D43718AC2116839300EA350A /* SecSMIMEPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718A62116839200EA350A /* SecSMIMEPriv.h */; };
+               D43718AD2116839300EA350A /* smimeutil.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718A72116839200EA350A /* smimeutil.c */; };
+               D43718B0211683AA00EA350A /* tsaSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718AE211683A900EA350A /* tsaSupport.c */; };
+               D43718B1211683AA00EA350A /* tsaTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = D43718AF211683AA00EA350A /* tsaTemplates.c */; };
+               D43718B6211683D400EA350A /* tsaSupportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718B2211683D100EA350A /* tsaSupportPriv.h */; };
+               D43718B7211683D400EA350A /* tsaSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718B3211683D200EA350A /* tsaSupport.h */; };
+               D43718B9211683D400EA350A /* tsaTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718B5211683D300EA350A /* tsaTemplates.h */; };
+               D43718BC211683F100EA350A /* tsaSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718B3211683D200EA350A /* tsaSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D43718C121168C4300EA350A /* libsecurity_cms.plist in Copy Open Source Version */ = {isa = PBXBuildFile; fileRef = D43718BF21168BCD00EA350A /* libsecurity_cms.plist */; };
+               D43718C321168C6D00EA350A /* libsecurity_cms.txt in Copy Open Source Licenses */ = {isa = PBXBuildFile; fileRef = D43718BE21168BCC00EA350A /* libsecurity_cms.txt */; };
+               D43718C821168D7D00EA350A /* SecSMIME.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718C721168D7C00EA350A /* SecSMIME.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D43718C921168D7D00EA350A /* SecSMIME.h in Headers */ = {isa = PBXBuildFile; fileRef = D43718C721168D7C00EA350A /* SecSMIME.h */; settings = {ATTRIBUTES = (Private, ); }; };

                D43761661EB2996C00954447 /* SecRevocationNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D43761641EB2996C00954447 /* SecRevocationNetworking.h */; };
                D43761671EB2996C00954447 /* SecRevocationNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = D43761651EB2996C00954447 /* SecRevocationNetworking.m */; };
                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D43761661EB2996C00954447 /* SecRevocationNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D43761641EB2996C00954447 /* SecRevocationNetworking.h */; };
                D43761671EB2996C00954447 /* SecRevocationNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = D43761651EB2996C00954447 /* SecRevocationNetworking.m */; };
                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7273402816CAFB3C0096622A /* MobileAsset.framework */; settings = {ATTRIBUTES = (Weak, ); }; };


@@ -1860,14 +2384,82 @@
                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 */; };
                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 */; };

+               D44282FF22D68564001746B3 /* TrustEvaluationTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */; };
+               D442830022D68564001746B3 /* TrustEvaluationTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */; };
+               D4428B342122604300EB8448 /* SecFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0B906C0ACCBD240077CD03 /* SecFramework.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4428B36212262F800EB8448 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                D447C4101D3094740082FC1D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                D447C4101D3094740082FC1D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };

+               D44D1F6F2115899C00E76E1A /* CMSUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E762115886D0014647E /* CMSUtils.c */; };
+               D44D1F70211589AC00E76E1A /* CMSDecoder.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E68211588680014647E /* CMSDecoder.c */; };
+               D44D1F71211589AC00E76E1A /* CMSEncoder.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E7C2115886F0014647E /* CMSEncoder.c */; };
+               D44D1F7221158A1300E76E1A /* smimeutil.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E722115886B0014647E /* smimeutil.c */; };
+               D44D1F7321158A1700E76E1A /* secoid.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E792115886E0014647E /* secoid.c */; };
+               D44D1F7421158A1A00E76E1A /* secalgid.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E69211588680014647E /* secalgid.c */; };
+               D44D1F7521158A1E00E76E1A /* plhash.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E742115886C0014647E /* plhash.c */; };
+               D44D1F7621158A3300E76E1A /* cmsutil.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E782115886D0014647E /* cmsutil.c */; };
+               D44D1F7821158A3A00E76E1A /* cmsrecinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E7F211588700014647E /* cmsrecinfo.c */; };
+               D44D1F7921158A3D00E76E1A /* cmspubkey.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E65211588670014647E /* cmspubkey.c */; };
+               D44D1F7A21158A4000E76E1A /* cmsmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E6C211588690014647E /* cmsmessage.c */; };
+               D44D1F7B21158A4400E76E1A /* cmsenvdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E7D2115886F0014647E /* cmsenvdata.c */; };
+               D44D1F7C21158A4900E76E1A /* cmsencdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E6F2115886A0014647E /* cmsencdata.c */; };
+               D44D1F7D21158A4C00E76E1A /* cmsdigdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E7B2115886E0014647E /* cmsdigdata.c */; };
+               D44D1F7E21158A5300E76E1A /* cmsdecode.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E732115886C0014647E /* cmsdecode.c */; };
+               D44D1F8021158A5B00E76E1A /* cmsarray.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E6B211588690014647E /* cmsarray.c */; };
+               D44D1F8121158A5D00E76E1A /* cmsasn1.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E772115886D0014647E /* cmsasn1.c */; };
+               D44D1F8221158A6000E76E1A /* cmsattr.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E66211588670014647E /* cmsattr.c */; };

                D450686A1E948D2200FA7675 /* 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 */; };
+               D453A4A32122235700850A26 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               D453A4AB2122236D00850A26 /* TrustEvaluationTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C9211E6A8200443CA1 /* TrustEvaluationTestCase.m */; };
+               D453A4AD2122236D00850A26 /* TrustFrameworkTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C4211E6A5700443CA1 /* TrustFrameworkTestCase.m */; };
+               D453A4AF2122236D00850A26 /* CertificateInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C6211E6A5700443CA1 /* CertificateInterfaceTests.m */; };
+               D453A4B22122236D00850A26 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               D453A4B32122236D00850A26 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */; };
+               D453A4B42122236D00850A26 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4B68C5C211A7D98009FED69 /* libDER.a */; };
+               D453A4B52122236D00850A26 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               D453A4B62122236D00850A26 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
+               D453A4B82122236D00850A26 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
+               D453A4B92122236D00850A26 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               D453A4BA2122236D00850A26 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               D453A4BC2122236D00850A26 /* si-82-sectrust-ct-data in Resources */ = {isa = PBXBuildFile; fileRef = D4A0F8C1211E6A2F00443CA1 /* si-82-sectrust-ct-data */; };
+               D458C4B0214E198F0043D982 /* CTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4AA214E198D0043D982 /* CTTests.m */; };
+               D458C4B1214E198F0043D982 /* CTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4AA214E198D0043D982 /* CTTests.m */; };
+               D458C4B2214E198F0043D982 /* EvaluationBasicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4AF214E198E0043D982 /* EvaluationBasicTests.m */; };
+               D458C4B3214E198F0043D982 /* EvaluationBasicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4AF214E198E0043D982 /* EvaluationBasicTests.m */; };
+               D458C4B8214E19AF0043D982 /* PathParseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B4214E19AE0043D982 /* PathParseTests.m */; };
+               D458C4B9214E19AF0043D982 /* PathParseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B4214E19AE0043D982 /* PathParseTests.m */; };
+               D458C4BA214E19AF0043D982 /* iAPTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B5214E19AE0043D982 /* iAPTests.m */; };
+               D458C4BB214E19AF0043D982 /* iAPTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B5214E19AE0043D982 /* iAPTests.m */; };
+               D458C4BC214E19AF0043D982 /* SignatureAlgorithmTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */; };
+               D458C4BD214E19AF0043D982 /* SignatureAlgorithmTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */; };
+               D458C4C2214E19FC0043D982 /* TrustSettingsInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4BE214E19FA0043D982 /* TrustSettingsInterfaceTests.m */; };
+               D458C4C3214E19FC0043D982 /* TrustInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4BF214E19FB0043D982 /* TrustInterfaceTests.m */; };
+               D458C4C4214E19FC0043D982 /* TrustInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4BF214E19FB0043D982 /* TrustInterfaceTests.m */; };
+               D458C4F9214E1E1B0043D982 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4CA214E1A420043D982 /* AppDelegate.m */; };
+               D458C4FB214E1E1B0043D982 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4CD214E1A430043D982 /* ViewController.m */; };
+               D458C4FD214E1E6C0043D982 /* appmain.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4FC214E1E6C0043D982 /* appmain.m */; };
+               D458C4FF214E1F8E0043D982 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D458C4FE214E1F8E0043D982 /* UIKit.framework */; };
+               D458C501214E1FB00043D982 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D458C500214E1FAF0043D982 /* Foundation.framework */; };
+               D458C507214E20540043D982 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D458C500214E1FAF0043D982 /* Foundation.framework */; };
+               D458C510214E207C0043D982 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4C6214E1A400043D982 /* main.m */; };
+               D458C512214E20850043D982 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D458C511214E20840043D982 /* XCTest.framework */; };
+               D458C515214E286C0043D982 /* PolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C513214E27620043D982 /* PolicyTests.m */; };
+               D458C516214E286D0043D982 /* PolicyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C513214E27620043D982 /* PolicyTests.m */; };
+               D458C517214E2C690043D982 /* si-20-sectrust-policies-data in Resources */ = {isa = PBXBuildFile; fileRef = D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */; };
+               D458C51A214E2CC80043D982 /* si-20-sectrust-policies-data in Resources */ = {isa = PBXBuildFile; fileRef = D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */; };
+               D458C51C214E2DEB0043D982 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D458C4C5214E1A400043D982 /* Assets.xcassets */; };
+               D458C51F214E2E0C0043D982 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D458C51E214E2E0C0043D982 /* Main.storyboard */; };
+               D458C520214E33260043D982 /* ECTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5766214E195300A32C01 /* ECTests.m */; };
+               D458C521214E33260043D982 /* ECTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5766214E195300A32C01 /* ECTests.m */; };
+               D458C522214E33370043D982 /* KeySizeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5768214E195400A32C01 /* KeySizeTests.m */; };
+               D458C523214E33380043D982 /* KeySizeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5768214E195400A32C01 /* KeySizeTests.m */; };
+               D458C524214E33430043D982 /* VerifyDateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5764214E195200A32C01 /* VerifyDateTests.m */; };
+               D458C525214E33440043D982 /* VerifyDateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC5764214E195200A32C01 /* VerifyDateTests.m */; };
+               D458DAC32375FEA300E5890E /* TrustSettingsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458DAC22375FEA300E5890E /* TrustSettingsTests.m */; };
+               D458DAC42375FEA300E5890E /* TrustSettingsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458DAC22375FEA300E5890E /* TrustSettingsTests.m */; };

                D45917E41DC13E6700752D25 /* SecCertificateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */; };
                D45917E41DC13E6700752D25 /* SecCertificateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E3E1D8085FC00865A7C /* SecCertificateRequest.c */; };

+               D4593EFF24C131180069F577 /* SecTrustStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C1B442C0BB9CAF900461B82 /* SecTrustStore.h */; settings = {ATTRIBUTES = (Private, ); }; };

                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, ); }; };
                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 */; };
                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 */; };


@@ -1877,38 +2469,76 @@
                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 */; };
                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 */; };
                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 */; };

-               D465131A2097FF2E005D93FE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0EB1E4549F300ECD7B5 /* Main.storyboard */; };
-               D465131B2097FF2E005D93FE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */; };
-               D465131C2097FF2E005D93FE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6CF4A0F01E4549F300ECD7B5 /* LaunchScreen.storyboard */; };
-               D46A6C09215336BC008ABF6A /* SecFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C0B906C0ACCBD240077CD03 /* SecFramework.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               D46B37A62151B7950083DAAA /* SecTrustStoreServer.m in Sources */ = {isa = PBXBuildFile; fileRef = D46B379F2151B6E50083DAAA /* SecTrustStoreServer.m */; };
+               D46CD4C72267949C00E2C4D7 /* certExtensionTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787621D77911D00B50D50 /* certExtensionTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D46CD4C82267949C00E2C4D7 /* nameTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787651D77911D00B50D50 /* nameTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D46CD4C92267949C00E2C4D7 /* X509Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787691D77911D00B50D50 /* X509Templates.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D47079F321128C74005BCFDA /* SecCMS.h in Headers */ = {isa = PBXBuildFile; fileRef = D47079F221128C46005BCFDA /* SecCMS.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D47079F421128CA0005BCFDA /* SecCMS.h in Headers */ = {isa = PBXBuildFile; fileRef = D47079F221128C46005BCFDA /* SecCMS.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D47079FA211355C5005BCFDA /* CMSEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D47079F9211355B3005BCFDA /* CMSEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               D47079FB211355C9005BCFDA /* CMSEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D47079F9211355B3005BCFDA /* CMSEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A0E211373DB005BCFDA /* CMSPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A0D211373D4005BCFDA /* CMSPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A0F211373DE005BCFDA /* CMSPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A0D211373D4005BCFDA /* CMSPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A1121137719005BCFDA /* CMSDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A1021137525005BCFDA /* CMSDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A1221137719005BCFDA /* CMSDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A1021137525005BCFDA /* CMSDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               D4707A202113AC33005BCFDA /* SecCmsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A1F2113AB65005BCFDA /* SecCmsBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A212113AC34005BCFDA /* SecCmsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A1F2113AB65005BCFDA /* SecCmsBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A232113E74B005BCFDA /* SecCmsEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A222113B48E005BCFDA /* SecCmsEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A242113E74B005BCFDA /* SecCmsEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A222113B48E005BCFDA /* SecCmsEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A262113EBC1005BCFDA /* SecCmsDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A252113E9B6005BCFDA /* SecCmsDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A272113EBC1005BCFDA /* SecCmsDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A252113E9B6005BCFDA /* SecCmsDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A292113EF68005BCFDA /* SecCmsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A282113ECA0005BCFDA /* SecCmsMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A2A2113EF68005BCFDA /* SecCmsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A282113ECA0005BCFDA /* SecCmsMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A2C2114C1E5005BCFDA /* SecCmsContentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2B2114B31A005BCFDA /* SecCmsContentInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A2D2114C1E8005BCFDA /* SecCmsContentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2B2114B31A005BCFDA /* SecCmsContentInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A2F2114C315005BCFDA /* SecCmsDigestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2E2114C30A005BCFDA /* SecCmsDigestContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4707A302114C316005BCFDA /* SecCmsDigestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2E2114C30A005BCFDA /* SecCmsDigestContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D477CB5C237B6E0E00C02355 /* PersonalizationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB5B237B6E0E00C02355 /* PersonalizationTests.m */; };
+               D477CB5D237B6E0E00C02355 /* PersonalizationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB5B237B6E0E00C02355 /* PersonalizationTests.m */; };
+               D477CB6A237CBA2C00C02355 /* TrustDaemonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB69237CBA2C00C02355 /* TrustDaemonTestCase.m */; };
+               D477CB6B237CBA2C00C02355 /* TrustDaemonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB69237CBA2C00C02355 /* TrustDaemonTestCase.m */; };
+               D477CB78237E482800C02355 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = D477CB76237E453C00C02355 /* si-88-sectrust-valid-data */; };
+               D477CB79237E484300C02355 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = D477CB76237E453C00C02355 /* si-88-sectrust-valid-data */; };
+               D477CB7B237E4BD700C02355 /* ExceptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB7A237E4BD700C02355 /* ExceptionTests.m */; };
+               D477CB7C237E4BD700C02355 /* ExceptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB7A237E4BD700C02355 /* ExceptionTests.m */; };
+               D477CB82237F692400C02355 /* RevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB81237F692400C02355 /* RevocationTests.m */; };
+               D477CB83237F692400C02355 /* RevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB81237F692400C02355 /* RevocationTests.m */; };
+               D477CB87237F8B2F00C02355 /* CAIssuerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB86237F8B2F00C02355 /* CAIssuerTests.m */; };
+               D477CB88237F8B2F00C02355 /* CAIssuerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB86237F8B2F00C02355 /* CAIssuerTests.m */; };
+               D477CB8B237F8DBC00C02355 /* AllowlistBlocklistTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB8A237F8DBB00C02355 /* AllowlistBlocklistTests.m */; };
+               D477CB8C237F8DBC00C02355 /* AllowlistBlocklistTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB8A237F8DBB00C02355 /* AllowlistBlocklistTests.m */; };
+               D477CB8F237F975500C02355 /* ValidTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB8E237F975500C02355 /* ValidTests.m */; };
+               D477CB90237F975500C02355 /* ValidTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D477CB8E237F975500C02355 /* ValidTests.m */; };

                D479F6E21F980FAB00388D28 /* Trust.strings in Resources */ = {isa = PBXBuildFile; fileRef = D479F6DF1F980F8F00388D28 /* Trust.strings */; };
                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 */; };
+               D479F6E31F981FD600388D28 /* OID.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C198F1F0ACDB4BF00AAB142 /* OID.strings */; };
+               D479F6E41F981FD600388D28 /* Certificate.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C198F1D0ACDB4BF00AAB142 /* Certificate.strings */; };
+               D479F6E51F981FD600388D28 /* Trust.strings in Resources */ = {isa = PBXBuildFile; fileRef = D479F6DF1F980F8F00388D28 /* Trust.strings */; };
+               D47AB2CB2356AD72005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D47AB2CC2356AD7C005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2CD2356AD8B005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2CE2356AD95005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2CF2356B2ED005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2D02356B2F6005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2D12356B2FE005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2D22356B325005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47AB2D62357955F005A3801 /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D47AB2CA2356AD72005A3801 /* Network.framework */; };
+               D47C457A255244AD00460750 /* CertificateTransparency.m in Sources */ = {isa = PBXBuildFile; fileRef = D47C4579255244AD00460750 /* CertificateTransparency.m */; };

                D47CA65D1EB036450038E2BB /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };
                D47CA65D1EB036450038E2BB /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };

+               D47DCCB523427C7D00B80E37 /* md.m in Sources */ = {isa = PBXBuildFile; fileRef = D47DCCB423427C7D00B80E37 /* md.m */; };

                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, ); }; };
                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, ); }; };

-               D484A1072167D707008653A9 /* ct_exceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = D484A1012167D6F8008653A9 /* ct_exceptions.m */; };

                D487B9821DFA28DB000410A1 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                D487B9881DFA2902000410A1 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                D487B9821DFA28DB000410A1 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.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 */; };

                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */; };
                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.m in Sources */ = {isa = PBXBuildFile; fileRef = D48BD193206C47530075DDC9 /* si-35-cms-expiration-time.m */; };
                D48E4E241E42F0620011B4BA /* si-62-csr.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDA1D8085FC00865A7C /* si-62-csr.m */; };
                D491112C209515400066A1E4 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };
                D491112D209515400066A1E4 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };
                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */; };
                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.m in Sources */ = {isa = PBXBuildFile; fileRef = D48BD193206C47530075DDC9 /* si-35-cms-expiration-time.m */; };
                D48E4E241E42F0620011B4BA /* si-62-csr.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DDA1D8085FC00865A7C /* si-62-csr.m */; };
                D491112C209515400066A1E4 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };
                D491112D209515400066A1E4 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };

-               D491112E209515400066A1E4 /* CKKSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */; };

                D491112F2095154B0066A1E4 /* MainMenu.xib in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622D1D909C4600D43BCB /* MainMenu.xib */; };
                D49111302095154B0066A1E4 /* MainMenu.xib in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622D1D909C4600D43BCB /* MainMenu.xib */; };
                D491112F2095154B0066A1E4 /* MainMenu.xib in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622D1D909C4600D43BCB /* MainMenu.xib */; };
                D49111302095154B0066A1E4 /* MainMenu.xib in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622D1D909C4600D43BCB /* MainMenu.xib */; };

-               D49111312095154B0066A1E4 /* Main.storyboard in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0C11E45488B00ECD7B5 /* Main.storyboard */; };

                D49111322095154B0066A1E4 /* Assets.xcassets in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */; };
                D49111692095593D0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D491116A2095593E0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D49111322095154B0066A1E4 /* Assets.xcassets in Sources */ = {isa = PBXBuildFile; fileRef = 6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */; };
                D49111692095593D0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D491116A2095593E0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };


@@ -1918,60 +2548,171 @@
                D491116E209559510066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D491116F209559510066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D49111702095595B0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D491116E209559510066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D491116F209559510066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D49111702095595B0066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

-               D4911171209559620066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; };

                D4911172209559630066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                D4911172209559630066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

-               D4911173209559630066A1E4 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

                D4961BC42079424200F16DA7 /* TrustURLSessionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */; };
                D4961BC42079424200F16DA7 /* TrustURLSessionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */; };

+               D4981B8F24F723EA004B033B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               D49A370C23877ECC0065719F /* OCSPCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370B23877ECC0065719F /* OCSPCacheTests.m */; };
+               D49A370D23877ECC0065719F /* OCSPCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370B23877ECC0065719F /* OCSPCacheTests.m */; };
+               D49BD0742476F67700FC7E1C /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               D49BD0762476F74B00FC7E1C /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               D49BD0772476F7C000FC7E1C /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               D49BD07824770E2D00FC7E1C /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               D4A0F8C2211E6A2F00443CA1 /* si-82-sectrust-ct-data in Resources */ = {isa = PBXBuildFile; fileRef = D4A0F8C1211E6A2F00443CA1 /* si-82-sectrust-ct-data */; };
+               D4A0F8C7211E6A5800443CA1 /* TrustFrameworkTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C4211E6A5700443CA1 /* TrustFrameworkTestCase.m */; };
+               D4A0F8C8211E6A5800443CA1 /* CertificateInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C6211E6A5700443CA1 /* CertificateInterfaceTests.m */; };
+               D4A0F8CC211E6A8300443CA1 /* TrustEvaluationTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A0F8C9211E6A8200443CA1 /* TrustEvaluationTestCase.m */; };
+               D4A3A597217A85D500F0A8DA /* ct_exceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */; };
+               D4A3A598217A85D600F0A8DA /* ct_exceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */; };
+               D4A55E70226A50E900FCC664 /* PolicyReporter.h in Sources */ = {isa = PBXBuildFile; fileRef = 1B995256226681ED00A2D6CD /* PolicyReporter.h */; };
+               D4A55E71226A50E900FCC664 /* PolicyReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B995258226681EE00A2D6CD /* PolicyReporter.m */; };
+               D4A7DD7420A26D3D00F51F3F /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D4A7DD7520A26D4900F51F3F /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               D4AA0D9A22FB959600D77FA4 /* si-29-cms-chain-mode.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AA0D9922FB959600D77FA4 /* si-29-cms-chain-mode.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 */; };
                D4AA643E1E95D94400D317ED /* trustd.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = D41257EC1E941CF200781F23 /* trustd.8 */; };
                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 */; };
                D4AA643E1E95D94400D317ED /* trustd.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = D41257EC1E941CF200781F23 /* trustd.8 */; };

-               D4AA64861E97273D00D317ED /* si-18-certificate-parse in Resources */ = {isa = PBXBuildFile; fileRef = D4AA64831E97270300D317ED /* si-18-certificate-parse */; };
-               D4AA64871E97274900D317ED /* si-18-certificate-parse in Resources */ = {isa = PBXBuildFile; fileRef = D4AA64831E97270300D317ED /* si-18-certificate-parse */; };
-               D4AA64881E97275200D317ED /* si-18-certificate-parse in Resources */ = {isa = PBXBuildFile; fileRef = D4AA64831E97270300D317ED /* si-18-certificate-parse */; };
-               D4AA64891E9727EB00D317ED /* si-18-certificate-parse.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AA647C1E97144700D317ED /* si-18-certificate-parse.m */; };

                D4AA9D121C3B1B1900A5640C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
                D4AA9D121C3B1B1900A5640C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };

+               D4AC8BE821320AD0006E9871 /* CertificateParseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC8BE721320AD0006E9871 /* CertificateParseTests.m */; };
+               D4AC8BE921320AD0006E9871 /* CertificateParseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AC8BE721320AD0006E9871 /* CertificateParseTests.m */; };
+               D4AC8BEE21321291006E9871 /* si-18-certificate-parse in Resources */ = {isa = PBXBuildFile; fileRef = D4AC8BED2132127A006E9871 /* si-18-certificate-parse */; };
+               D4AC8BEF213212A7006E9871 /* si-18-certificate-parse in Resources */ = {isa = PBXBuildFile; fileRef = D4AC8BED2132127A006E9871 /* si-18-certificate-parse */; };

                D4AD87701E452CE000CA1B7F /* si-68-secmatchissuer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */; };
                D4ADA32E1E2B43220031CEA3 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                D4ADA32F1E2B43220031CEA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                D4ADA3301E2B433B0031CEA3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                D4AD87701E452CE000CA1B7F /* si-68-secmatchissuer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */; };
                D4ADA32E1E2B43220031CEA3 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                D4ADA32F1E2B43220031CEA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                D4ADA3301E2B433B0031CEA3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };

+               D4B2966A22DBFDC700DCF250 /* TestCopyProperties_ios-data in Resources */ = {isa = PBXBuildFile; fileRef = D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */; };
+               D4B2966B22DBFDD300DCF250 /* TestCopyProperties_ios-data in Resources */ = {isa = PBXBuildFile; fileRef = D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */; };
+               D4B3B1CC2115150D00A43409 /* SecCmsDigestedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CB2115149C00A43409 /* SecCmsDigestedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1CD2115150D00A43409 /* SecCmsDigestedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CB2115149C00A43409 /* SecCmsDigestedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1CF211516A000A43409 /* SecCmsEncryptedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CE2115167600A43409 /* SecCmsEncryptedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D0211516A100A43409 /* SecCmsEncryptedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CE2115167600A43409 /* SecCmsEncryptedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D2211517BC00A43409 /* SecCmsEnvelopedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D1211517B000A43409 /* SecCmsEnvelopedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D3211517BC00A43409 /* SecCmsEnvelopedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D1211517B000A43409 /* SecCmsEnvelopedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D52115195900A43409 /* SecCmsRecipientInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D42115193600A43409 /* SecCmsRecipientInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D62115195900A43409 /* SecCmsRecipientInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D42115193600A43409 /* SecCmsRecipientInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D821151BBF00A43409 /* SecCmsSignedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D721151B9900A43409 /* SecCmsSignedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1D921151BBF00A43409 /* SecCmsSignedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D721151B9900A43409 /* SecCmsSignedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1DB21152AD200A43409 /* SecCmsSignerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1DA2115293300A43409 /* SecCmsSignerInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B3B1DC21152AD300A43409 /* SecCmsSignerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1DA2115293300A43409 /* SecCmsSignerInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               D4B68C44211A3DCC009FED69 /* libtrustd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4ADA3191E2B41670031CEA3 /* libtrustd.a */; };
+               D4B68C5B211A7D29009FED69 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               D4B68C5D211A7D98009FED69 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4B68C5C211A7D98009FED69 /* libDER.a */; };
+               D4B68C5F211A80B1009FED69 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB96BB41F966E0C00E11457 /* libsqlite3.tbd */; };
+               D4B68C60211A80BC009FED69 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
+               D4B68C61211A80C4009FED69 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               D4B68C62211A80CE009FED69 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               D4B68C63211A80DA009FED69 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               D4B68C66211A8186009FED69 /* trustd_spi.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B68C64211A8186009FED69 /* trustd_spi.h */; };
+               D4B68C68211A827C009FED69 /* trustd_spi.c in Sources */ = {isa = PBXBuildFile; fileRef = D4B68C65211A8186009FED69 /* trustd_spi.c */; };

                D4B6D57C2069D8450099FBEF /* si-34-cms-timestamp.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B6D57B2069D8450099FBEF /* si-34-cms-timestamp.m */; };
                D4B6D57C2069D8450099FBEF /* si-34-cms-timestamp.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B6D57B2069D8450099FBEF /* si-34-cms-timestamp.m */; };

-               D4B858671D370D9A003B2D95 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4B858661D370D9A003B2D95 /* MobileCoreServices.framework */; };
+               D4BD5E83228A6823001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };
+               D4BD5E85228A6854001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };
+               D4BD5E86228A6855001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };
+               D4BD5E87228A6856001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };
+               D4BD5E88228A6857001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };
+               D4BD5E93228A720E001650A7 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 1BC6F79621C9955D005ED67A /* util.m */; };

                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 */; };
                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 */; };
                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 */; };

+               D4D1FDC721163F6A003538E2 /* SecCmsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A1F2113AB65005BCFDA /* SecCmsBase.h */; };
+               D4D1FDC821163F6A003538E2 /* SecCmsContentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2B2114B31A005BCFDA /* SecCmsContentInfo.h */; };
+               D4D1FDC921163F6A003538E2 /* SecCmsDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A252113E9B6005BCFDA /* SecCmsDecoder.h */; };
+               D4D1FDCA21163F6A003538E2 /* SecCmsDigestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A2E2114C30A005BCFDA /* SecCmsDigestContext.h */; };
+               D4D1FDCB21163F6A003538E2 /* SecCmsDigestedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CB2115149C00A43409 /* SecCmsDigestedData.h */; };
+               D4D1FDCC21163F6A003538E2 /* SecCmsEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A222113B48E005BCFDA /* SecCmsEncoder.h */; };
+               D4D1FDCD21163F6A003538E2 /* SecCmsEncryptedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1CE2115167600A43409 /* SecCmsEncryptedData.h */; };
+               D4D1FDCE21163F6A003538E2 /* SecCmsEnvelopedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D1211517B000A43409 /* SecCmsEnvelopedData.h */; };
+               D4D1FDCF21163F6A003538E2 /* SecCmsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = D4707A282113ECA0005BCFDA /* SecCmsMessage.h */; };
+               D4D1FDD021163F6A003538E2 /* SecCmsRecipientInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D42115193600A43409 /* SecCmsRecipientInfo.h */; };
+               D4D1FDD121163F6A003538E2 /* SecCmsSignedData.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1D721151B9900A43409 /* SecCmsSignedData.h */; };
+               D4D1FDD221163F6A003538E2 /* SecCmsSignerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B3B1DA2115293300A43409 /* SecCmsSignerInfo.h */; };
+               D4D1FDD621164138003538E2 /* cmssigdata.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E6D2115886A0014647E /* cmssigdata.c */; };
+               D4D1FDD721164167003538E2 /* cmscipher.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CF6E6E2115886A0014647E /* cmscipher.c */; };
+               D4D1FDE021165FAE003538E2 /* cms_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = D42C83A121159568008D3D83 /* cms_regressions.h */; };
+               D4D1FDE221165FC6003538E2 /* cms-trust-settings-test.c in Sources */ = {isa = PBXBuildFile; fileRef = D42C83A221159569008D3D83 /* cms-trust-settings-test.c */; };
+               D4D1FDE32116608B003538E2 /* libsecurity_cms_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4D1FDDC21165F8B003538E2 /* libsecurity_cms_regressions.a */; };
+               D4D1FDE4211660F4003538E2 /* cms-trust-settings-test.h in Headers */ = {isa = PBXBuildFile; fileRef = D42C83A321159569008D3D83 /* cms-trust-settings-test.h */; };
+               D4D1FDE521166135003538E2 /* libsecurity_cms_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4D1FDDC21165F8B003538E2 /* libsecurity_cms_regressions.a */; };

                D4D718351E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */; };
                D4D718351E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c in Sources */ = {isa = PBXBuildFile; fileRef = D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */; };

-               D4D886BF1CEB9F3B00DC7583 /* ssl-policy-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886BE1CEB9F3B00DC7583 /* ssl-policy-certs */; };
-               D4D886C01CEB9F7200DC7583 /* ssl-policy-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886BE1CEB9F3B00DC7583 /* ssl-policy-certs */; };

                D4D886E91CEBDD2A00DC7583 /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };
                D4D886EA1CEBDE0800DC7583 /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };
                D4D886E91CEBDD2A00DC7583 /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };
                D4D886EA1CEBDE0800DC7583 /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };

-               D4EC94FB1CEA482D0083E753 /* si-20-sectrust-policies-data in Resources */ = {isa = PBXBuildFile; fileRef = D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */; };
-               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 */; };
+               D4D92DA522788FEB0009A7CF /* NISTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4D92DA422788FEB0009A7CF /* NISTTests.m */; };
+               D4D92DA622788FEB0009A7CF /* NISTTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4D92DA422788FEB0009A7CF /* NISTTests.m */; };
+               D4D92DA8227890500009A7CF /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D92DA72278904F0009A7CF /* nist-certs */; };
+               D4D92DA9227890500009A7CF /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D92DA72278904F0009A7CF /* nist-certs */; };
+               D4E6D8592404EAD40074CB26 /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246911F9AE2E400D63882 /* libDER.a */; };
+               D4EA5CF822B225D100883439 /* LoggingServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EA5CF622B225C000883439 /* LoggingServerTests.m */; };
+               D4EA5CF922B225D100883439 /* LoggingServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EA5CF622B225C000883439 /* LoggingServerTests.m */; };
+               D4EF32172156B025000A31A5 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               D4EF32182156DDEB000A31A5 /* TrustSettingsInterfaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D458C4BE214E19FA0043D982 /* TrustSettingsInterfaceTests.m */; };
+               D4EF3221215F0F7F000A31A5 /* SecTrustStoreServer.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EF321E215F0F76000A31A5 /* SecTrustStoreServer.m */; };
+               D4F56B95217FC93500FCA6B7 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               D4FD421C217D789C002B7EE2 /* NameConstraintsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4FD421B217D7891002B7EE2 /* NameConstraintsTests.m */; };
+               D4FD421D217D789C002B7EE2 /* NameConstraintsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4FD421B217D7891002B7EE2 /* NameConstraintsTests.m */; };
+               D4FD4220217D7B2E002B7EE2 /* PathScoringTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */; };
+               D4FD4221217D7B2E002B7EE2 /* PathScoringTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */; };
+               D4FD4224217D7BE4002B7EE2 /* libarchive.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4FD4223217D7BE3002B7EE2 /* libarchive.2.tbd */; };
+               D4FD4225217D7BEE002B7EE2 /* libarchive.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4FD4223217D7BE3002B7EE2 /* libarchive.2.tbd */; };
+               D4FD4226217D7C41002B7EE2 /* si-87-sectrust-name-constraints in Resources */ = {isa = PBXBuildFile; fileRef = D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */; };
+               D4FD4227217D7C4F002B7EE2 /* si-87-sectrust-name-constraints in Resources */ = {isa = PBXBuildFile; fileRef = D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */; };
+               DA20716222E9367500E209E4 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               DA2C402E2189302F005F1CC3 /* mach_notify.defs in Sources */ = {isa = PBXBuildFile; fileRef = DA2C402D2189302E005F1CC3 /* mach_notify.defs */; settings = {ATTRIBUTES = (Server, ); }; };
+               DA2F591823A32BC100C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F591E23A986A300C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F592123A9874800C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F592523A99E8400C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F592623A99EC900C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F592723A99F2900C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA2F592823A99F6300C30285 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };

                DA30D6851DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30D6841DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m */; };
                DA30D6851DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30D6841DF8CA4100EC6B43 /* KeychainSyncAccountUpdater.m */; };

+               DA31CB212319DC8F0039F1CC /* TPStringTable.m in Sources */ = {isa = PBXBuildFile; fileRef = DA700FC82310C0E00051A7DE /* TPStringTable.m */; };
+               DA3862A723A9CD2E001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3862A923AAD1FD001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3862AA23AAD959001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3862AB23AAE3A8001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3862AC23AAE3D3001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3862AE23AAE65E001E21F1 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA3AD86A2319AA5D0049AFD6 /* TPStringTableTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DA3AD8682319AA310049AFD6 /* TPStringTableTests.m */; };
+               DA41FE1A2241AF4600838FB3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA41FE192241AF3E00838FB3 /* main.m */; };
+               DA41FE1B2241AF8200838FB3 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD744683195A00BB00FB01C0 /* IDS.framework */; };
+               DA45865C2245AEDB0073F993 /* OTPairingService.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4586592245AEDA0073F993 /* OTPairingService.m */; };
+               DA53FC3923A9BA68002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC3C23A9BDD5002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC3D23A9BF28002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC3E23A9C180002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC3F23A9C26F002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4023A9C351002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4123A9C3CE002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4223A9C442002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4423A9C779002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4523A9C801002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4623A9CB13002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4723A9CBAA002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4823A9CC16002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };
+               DA53FC4923A9CC8D002D5EA9 /* SoftLinking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA2F591523A32BB400C30285 /* SoftLinking.framework */; };

                DA5B871C2065A8440093F083 /* SecAutorelease.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5B871A2065A8410093F083 /* SecAutorelease.h */; };
                DA5B871D2065A8440093F083 /* SecAutorelease.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5B871B2065A8430093F083 /* SecAutorelease.m */; };
                DA6AA1651FE88AFB004565B0 /* CKKSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */; };
                DA5B871C2065A8440093F083 /* SecAutorelease.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5B871A2065A8410093F083 /* SecAutorelease.h */; };
                DA5B871D2065A8440093F083 /* SecAutorelease.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5B871B2065A8430093F083 /* SecAutorelease.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 */; };
                DA6AA1671FE88AFB004565B0 /* CKKSControlServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */; };

-               DA6AA1681FE88AFB004565B0 /* CKKSControlServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */; };
+               DA700FC92310C0E00051A7DE /* TPStringTable.h in Headers */ = {isa = PBXBuildFile; fileRef = DA700FC62310C0DF0051A7DE /* TPStringTable.h */; };
+               DA700FCA2310C0E00051A7DE /* TPStringTable.m in Sources */ = {isa = PBXBuildFile; fileRef = DA700FC82310C0E00051A7DE /* TPStringTable.m */; };

                DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */; };
                DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */; };

+               DAC58D1B22443C0700D4CD41 /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */; };
+               DAC58D202244528B00D4CD41 /* OTPairingPacketContext.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC58D1E2244528000D4CD41 /* OTPairingPacketContext.m */; };
+               DACAD62A229F6E6A0002BBC3 /* OTPairingSession.m in Sources */ = {isa = PBXBuildFile; fileRef = DACAD629229F6E6A0002BBC3 /* OTPairingSession.m */; };

                DAE40BC920CF3E46002D5674 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                DAE40BCA20CF3E46002D5674 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                DAE40BD920CF3F0F002D5674 /* secitemcanarytest.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE40BD820CF3F04002D5674 /* secitemcanarytest.m */; };
                DAEE055C1FAD3FC700DF27F3 /* AutoreleaseTest.c in Sources */ = {isa = PBXBuildFile; fileRef = DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */; };
                DAE40BC920CF3E46002D5674 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                DAE40BCA20CF3E46002D5674 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                DAE40BD920CF3F0F002D5674 /* secitemcanarytest.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE40BD820CF3F04002D5674 /* secitemcanarytest.m */; };
                DAEE055C1FAD3FC700DF27F3 /* AutoreleaseTest.c in Sources */ = {isa = PBXBuildFile; fileRef = DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */; };

+               DAEF8E5A22581A1200F7DF79 /* OTPairingClient.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8E57225819EF00F7DF79 /* OTPairingClient.m */; };
+               DAEF8E5C22581CDF00F7DF79 /* OTPairingClient.m in Sources */ = {isa = PBXBuildFile; fileRef = DAEF8E57225819EF00F7DF79 /* OTPairingClient.m */; };

                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 */; };
                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 */; };


@@ -1982,21 +2723,15 @@
                DC00AB6F1D821C3400513D74 /* libSecItemShimOSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EE6E1D80D82600B0A59C /* libSecItemShimOSX.a */; };
                DC00AB701D821C3800513D74 /* libSecOtrOSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD66DDB1D8205C400DB1393 /* libSecOtrOSX.a */; };
                DC00AB7A1D821C6B00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00AB6F1D821C3400513D74 /* libSecItemShimOSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EE6E1D80D82600B0A59C /* libSecItemShimOSX.a */; };
                DC00AB701D821C3800513D74 /* libSecOtrOSX.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD66DDB1D8205C400DB1393 /* libSecOtrOSX.a */; };
                DC00AB7A1D821C6B00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

-               DC00AB7B1D821C6E00513D74 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };

                DC00AB7C1D821C7100513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00AB811D821C9100513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00AB821D821C9500513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00AB831D821C9A00513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB8E1D821D4900513D74 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };
                DC00AB7C1D821C7100513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00AB811D821C9100513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00AB821D821C9500513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00AB831D821C9A00513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB8E1D821D4900513D74 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };

-               DC00AB8F1D821D4D00513D74 /* libSecurityTool.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */; };
-               DC00AB901D821D5600513D74 /* libSecurityCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EBD51D80CEF100B0A59C /* libSecurityCommands.a */; };

                DC00AB971D821D7100513D74 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };
                DC00AB971D821D7100513D74 /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };

-               DC00AB981D821D7400513D74 /* libSecurityTool.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */; };
-               DC00AB991D821D7700513D74 /* libSecurityCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EBD51D80CEF100B0A59C /* libSecurityCommands.a */; };

                DC00AB9A1D821D8800513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB9B1D821D9F00513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB9C1D821DA400513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00AB9A1D821D8800513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB9B1D821D9F00513D74 /* libSWCAgent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */; };
                DC00AB9C1D821DA400513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };

-               DC00ABA51D821DCD00513D74 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };

                DC00ABB31D821E0400513D74 /* libSharedRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EE411D80D6DD00B0A59C /* libSharedRegressions.a */; };
                DC00ABB41D821E0700513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABB51D821E0B00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00ABB31D821E0400513D74 /* libSharedRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EE411D80D6DD00B0A59C /* libSharedRegressions.a */; };
                DC00ABB41D821E0700513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABB51D821E0B00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };


@@ -2019,19 +2754,31 @@
                DC00ABE61D821F7700513D74 /* libsecdRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */; };
                DC00ABE81D821F7D00513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABE91D821F8000513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00ABE61D821F7700513D74 /* libsecdRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */; };
                DC00ABE81D821F7D00513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABE91D821F8000513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

-               DC00ABEC1D821FA600513D74 /* libSecurityTool.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */; };

                DC00ABF11D821FC400513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABF21D821FC800513D74 /* libSOSRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC681D80D0C400B0A59C /* libSOSRegressions.a */; };
                DC00ABF31D821FCD00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC00ABF11D821FC400513D74 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC00ABF21D821FC800513D74 /* libSOSRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC681D80D0C400B0A59C /* libSOSRegressions.a */; };
                DC00ABF31D821FCD00513D74 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

-               DC066DF02102563300694EAF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
+               DC00C92020B3B7CC00628BEB /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246911F9AE2E400D63882 /* libDER.a */; };
+               DC00C92320B3B80500628BEB /* libbsm.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EB49B2DC202DF251003F34A0 /* libbsm.tbd */; };
+               DC00C92420B3B82600628BEB /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               DC00C93420B48B4100628BEB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               DC00C93520B48BA800628BEB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               DC03592D235FCCD500F14883 /* KCInitialMessageData.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A47FFB5228F5E9000F781B8 /* KCInitialMessageData.m */; };
+               DC047081218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC04707F218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.h */; };
+               DC047082218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = DC047080218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m */; };
+               DC047087218BCEF20078BDAA /* OTOperationDependencies.h in Headers */ = {isa = PBXBuildFile; fileRef = DC047085218BCEF20078BDAA /* OTOperationDependencies.h */; };
+               DC047088218BCEF20078BDAA /* OTOperationDependencies.m in Sources */ = {isa = PBXBuildFile; fileRef = DC047086218BCEF20078BDAA /* OTOperationDependencies.m */; };
+               DC05035E214083B200A8EDB7 /* TPHObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB9475421274A1900ED9272 /* TPHObjcTranslation.m */; };
+               DC05037A21409A4100A8EDB7 /* OCMockUmbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = DC05037821409A4100A8EDB7 /* OCMockUmbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               DC05038121409A6100A8EDB7 /* OCMock.framework in Embed OCMock */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               DC05038221409B3400A8EDB7 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
+               DC061A71246213660026ADB3 /* CKKSLocalResetOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC061A70246211DE0026ADB3 /* CKKSLocalResetOperation.m */; };
+               DC061A722462136F0026ADB3 /* CKKSOperationDependencies.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3412E6245780BA008ABD0A /* CKKSOperationDependencies.m */; };
+               DC07090422936DB2002711B9 /* OctagonTests+ErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC07090222936BCC002711B9 /* OctagonTests+ErrorHandling.swift */; };

                DC08D1C41E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
                DC08D1CC1E64FCC5006237DA /* CKKSSOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1CB1E64FCC5006237DA /* CKKSSOSTests.m */; };
                DC08D1C41E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
                DC08D1CC1E64FCC5006237DA /* CKKSSOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1CB1E64FCC5006237DA /* CKKSSOSTests.m */; };

-               DC0950411E38271300B2C8AC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
-               DC0984FD1E1DB6DF00140ADC /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };

                DC0984FE1E1DB70100140ADC /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC0B62281D90974300D43BCB /* si-25-cms-skid.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0B62261D90973900D43BCB /* si-25-cms-skid.h */; };
                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0B62271D90973900D43BCB /* si-25-cms-skid.m */; };
                DC0984FE1E1DB70100140ADC /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DC0B62281D90974300D43BCB /* si-25-cms-skid.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0B62261D90973900D43BCB /* si-25-cms-skid.h */; };
                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0B62271D90973900D43BCB /* si-25-cms-skid.m */; };

-               DC0B622A1D9097C600D43BCB /* libsecurity_cms_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1002CB1D8E19D70025549C /* libsecurity_cms_regressions.a */; };

                DC0B622C1D90982C00D43BCB /* secd-201-coders.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622B1D90982100D43BCB /* secd-201-coders.m */; };
                DC0BC5611D8B6D6000070CB0 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC5461D8B6AFE00070CB0 /* main.c */; };
                DC0BC5621D8B6D7000070CB0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC0B622C1D90982C00D43BCB /* secd-201-coders.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0B622B1D90982100D43BCB /* secd-201-coders.m */; };
                DC0BC5611D8B6D6000070CB0 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC5461D8B6AFE00070CB0 /* main.c */; };
                DC0BC5621D8B6D7000070CB0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };


@@ -2080,15 +2827,10 @@
                DC0BC5F51D8B745700070CB0 /* comDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC5EF1D8B745700070CB0 /* comDebug.h */; };
                DC0BC6511D8B755200070CB0 /* byteRep.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6031D8B755200070CB0 /* byteRep.c */; };
                DC0BC6521D8B755200070CB0 /* byteRep.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6041D8B755200070CB0 /* byteRep.h */; };
                DC0BC5F51D8B745700070CB0 /* comDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC5EF1D8B745700070CB0 /* comDebug.h */; };
                DC0BC6511D8B755200070CB0 /* byteRep.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6031D8B755200070CB0 /* byteRep.c */; };
                DC0BC6521D8B755200070CB0 /* byteRep.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6041D8B755200070CB0 /* byteRep.h */; };

-               DC0BC6541D8B755200070CB0 /* CipherFileDES.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6061D8B755200070CB0 /* CipherFileDES.h */; };
-               DC0BC6561D8B755200070CB0 /* CipherFileFEED.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6081D8B755200070CB0 /* CipherFileFEED.h */; };
-               DC0BC6571D8B755200070CB0 /* CipherFileTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6091D8B755200070CB0 /* CipherFileTypes.h */; };

                DC0BC6581D8B755200070CB0 /* ckconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC60A1D8B755200070CB0 /* ckconfig.h */; };
                DC0BC6581D8B755200070CB0 /* ckconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC60A1D8B755200070CB0 /* ckconfig.h */; };

-               DC0BC65A1D8B755200070CB0 /* ckDES.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC60C1D8B755200070CB0 /* ckDES.h */; };

                DC0BC65C1D8B755200070CB0 /* ckMD5.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC60E1D8B755200070CB0 /* ckMD5.h */; };
                DC0BC65D1D8B755200070CB0 /* ckSHA1.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC60F1D8B755200070CB0 /* ckSHA1.c */; };
                DC0BC65E1D8B755200070CB0 /* ckSHA1.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6101D8B755200070CB0 /* ckSHA1.h */; };
                DC0BC65C1D8B755200070CB0 /* ckMD5.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC60E1D8B755200070CB0 /* ckMD5.h */; };
                DC0BC65D1D8B755200070CB0 /* ckSHA1.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC60F1D8B755200070CB0 /* ckSHA1.c */; };
                DC0BC65E1D8B755200070CB0 /* ckSHA1.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6101D8B755200070CB0 /* ckSHA1.h */; };

-               DC0BC6601D8B755200070CB0 /* ckSHA1_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6121D8B755200070CB0 /* ckSHA1_priv.h */; };

                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 */; };
                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 */; };


@@ -2097,11 +2839,9 @@
                DC0BC6681D8B755200070CB0 /* CryptKitDER.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */; };
                DC0BC6691D8B755200070CB0 /* CryptKitDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */; };
                DC0BC66A1D8B755200070CB0 /* curveParamData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61C1D8B755200070CB0 /* curveParamData.h */; };
                DC0BC6681D8B755200070CB0 /* CryptKitDER.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */; };
                DC0BC6691D8B755200070CB0 /* CryptKitDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */; };
                DC0BC66A1D8B755200070CB0 /* curveParamData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61C1D8B755200070CB0 /* curveParamData.h */; };

-               DC0BC66B1D8B755200070CB0 /* curveParamDataOld.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61D1D8B755200070CB0 /* curveParamDataOld.h */; };

                DC0BC66C1D8B755200070CB0 /* curveParams.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC61E1D8B755200070CB0 /* curveParams.c */; };
                DC0BC66D1D8B755200070CB0 /* curveParams.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61F1D8B755200070CB0 /* curveParams.h */; };
                DC0BC66E1D8B755200070CB0 /* ECDSA_Profile.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */; };
                DC0BC66C1D8B755200070CB0 /* curveParams.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC61E1D8B755200070CB0 /* curveParams.c */; };
                DC0BC66D1D8B755200070CB0 /* curveParams.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC61F1D8B755200070CB0 /* curveParams.h */; };
                DC0BC66E1D8B755200070CB0 /* ECDSA_Profile.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */; };

-               DC0BC66F1D8B755200070CB0 /* ECDSA_Verify_Prefix.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6211D8B755200070CB0 /* ECDSA_Verify_Prefix.h */; };

                DC0BC6701D8B755200070CB0 /* elliptic.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6221D8B755200070CB0 /* elliptic.c */; };
                DC0BC6711D8B755200070CB0 /* elliptic.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6231D8B755200070CB0 /* elliptic.h */; };
                DC0BC6721D8B755200070CB0 /* ellipticMeasure.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */; };
                DC0BC6701D8B755200070CB0 /* elliptic.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6221D8B755200070CB0 /* elliptic.c */; };
                DC0BC6711D8B755200070CB0 /* elliptic.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6231D8B755200070CB0 /* elliptic.h */; };
                DC0BC6721D8B755200070CB0 /* ellipticMeasure.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */; };


@@ -2109,13 +2849,9 @@
                DC0BC6741D8B755200070CB0 /* ellipticProj.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6261D8B755200070CB0 /* ellipticProj.h */; };
                DC0BC6751D8B755200070CB0 /* enc64.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6271D8B755200070CB0 /* enc64.c */; };
                DC0BC6761D8B755200070CB0 /* enc64.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6281D8B755200070CB0 /* enc64.h */; };
                DC0BC6741D8B755200070CB0 /* ellipticProj.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6261D8B755200070CB0 /* ellipticProj.h */; };
                DC0BC6751D8B755200070CB0 /* enc64.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6271D8B755200070CB0 /* enc64.c */; };
                DC0BC6761D8B755200070CB0 /* enc64.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6281D8B755200070CB0 /* enc64.h */; };

-               DC0BC6771D8B755200070CB0 /* engineNSA127.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6291D8B755200070CB0 /* engineNSA127.c */; };

                DC0BC6781D8B755200070CB0 /* falloc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC62A1D8B755200070CB0 /* falloc.c */; };
                DC0BC6791D8B755200070CB0 /* falloc.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62B1D8B755200070CB0 /* falloc.h */; };
                DC0BC6781D8B755200070CB0 /* falloc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC62A1D8B755200070CB0 /* falloc.c */; };
                DC0BC6791D8B755200070CB0 /* falloc.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62B1D8B755200070CB0 /* falloc.h */; };

-               DC0BC67A1D8B755200070CB0 /* feeCipherFile.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62C1D8B755200070CB0 /* feeCipherFile.h */; };

                DC0BC67B1D8B755200070CB0 /* feeDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62D1D8B755200070CB0 /* feeDebug.h */; };
                DC0BC67B1D8B755200070CB0 /* feeDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62D1D8B755200070CB0 /* feeDebug.h */; };

-               DC0BC67C1D8B755200070CB0 /* feeDES.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC62E1D8B755200070CB0 /* feeDES.c */; };
-               DC0BC67D1D8B755200070CB0 /* feeDES.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC62F1D8B755200070CB0 /* feeDES.h */; };

                DC0BC67E1D8B755200070CB0 /* feeDigitalSignature.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */; };
                DC0BC67F1D8B755200070CB0 /* feeDigitalSignature.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */; };
                DC0BC6801D8B755200070CB0 /* feeECDSA.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6321D8B755200070CB0 /* feeECDSA.c */; };
                DC0BC67E1D8B755200070CB0 /* feeDigitalSignature.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */; };
                DC0BC67F1D8B755200070CB0 /* feeDigitalSignature.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */; };
                DC0BC6801D8B755200070CB0 /* feeECDSA.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6321D8B755200070CB0 /* feeECDSA.c */; };


@@ -2136,11 +2872,6 @@
                DC0BC68F1D8B755200070CB0 /* giantIntegers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6411D8B755200070CB0 /* giantIntegers.c */; };
                DC0BC6901D8B755200070CB0 /* giantIntegers.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6421D8B755200070CB0 /* giantIntegers.h */; };
                DC0BC6911D8B755200070CB0 /* giantPort_Generic.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */; };
                DC0BC68F1D8B755200070CB0 /* giantIntegers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6411D8B755200070CB0 /* giantIntegers.c */; };
                DC0BC6901D8B755200070CB0 /* giantIntegers.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6421D8B755200070CB0 /* giantIntegers.h */; };
                DC0BC6911D8B755200070CB0 /* giantPort_Generic.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */; };

-               DC0BC6921D8B755200070CB0 /* giantPort_i486.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6441D8B755200070CB0 /* giantPort_i486.h */; };
-               DC0BC6931D8B755200070CB0 /* giantPort_PPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6451D8B755200070CB0 /* giantPort_PPC.c */; };
-               DC0BC6941D8B755200070CB0 /* giantPort_PPC.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6461D8B755200070CB0 /* giantPort_PPC.h */; };
-               DC0BC6951D8B755200070CB0 /* giantPort_PPC_Gnu.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6471D8B755200070CB0 /* giantPort_PPC_Gnu.h */; };
-               DC0BC6961D8B755200070CB0 /* giantPort_PPC_Gnu.s in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC6481D8B755200070CB0 /* giantPort_PPC_Gnu.s */; };

                DC0BC6971D8B755200070CB0 /* giantPortCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6491D8B755200070CB0 /* giantPortCommon.h */; };
                DC0BC6981D8B755200070CB0 /* HmacSha1Legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */; };
                DC0BC6991D8B755200070CB0 /* HmacSha1Legacy.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */; };
                DC0BC6971D8B755200070CB0 /* giantPortCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC6491D8B755200070CB0 /* giantPortCommon.h */; };
                DC0BC6981D8B755200070CB0 /* HmacSha1Legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */; };
                DC0BC6991D8B755200070CB0 /* HmacSha1Legacy.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */; };


@@ -2467,9 +3198,6 @@
                DC0BCC171D8C64B600070CB0 /* testcert.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC081D8C64B500070CB0 /* testcert.h */; };
                DC0BCC181D8C64B600070CB0 /* testpolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC091D8C64B500070CB0 /* testpolicy.h */; };
                DC0BCC191D8C64B600070CB0 /* testpolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC0A1D8C64B500070CB0 /* testpolicy.m */; };
                DC0BCC171D8C64B600070CB0 /* testcert.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC081D8C64B500070CB0 /* testcert.h */; };
                DC0BCC181D8C64B600070CB0 /* testpolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC091D8C64B500070CB0 /* testpolicy.h */; };
                DC0BCC191D8C64B600070CB0 /* testpolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC0A1D8C64B500070CB0 /* testpolicy.m */; };

-               DC0BCC1A1D8C653600070CB0 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               DC0BCC291D8C684F00070CB0 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-               DC0BCD1D1D8C694700070CB0 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

                DC0BCD661D8C69A000070CB0 /* utilities_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCD491D8C697100070CB0 /* utilities_regressions.h */; };
                DC0BCD671D8C69A000070CB0 /* su-05-cfwrappers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD4A1D8C697100070CB0 /* su-05-cfwrappers.c */; };
                DC0BCD681D8C69A000070CB0 /* su-07-debugging.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD4B1D8C697100070CB0 /* su-07-debugging.c */; };
                DC0BCD661D8C69A000070CB0 /* utilities_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCD491D8C697100070CB0 /* utilities_regressions.h */; };
                DC0BCD671D8C69A000070CB0 /* su-05-cfwrappers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD4A1D8C697100070CB0 /* su-05-cfwrappers.c */; };
                DC0BCD681D8C69A000070CB0 /* su-07-debugging.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD4B1D8C697100070CB0 /* su-07-debugging.c */; };


@@ -2486,8 +3214,6 @@
                DC0BCD731D8C69A000070CB0 /* su-41-secdb-stress.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD561D8C697100070CB0 /* su-41-secdb-stress.c */; };
                DC0BCD751D8C6A1E00070CB0 /* iCloudKeychainTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */; };
                DC0BCD761D8C6A1E00070CB0 /* iCloudKeychainTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */; };
                DC0BCD731D8C69A000070CB0 /* su-41-secdb-stress.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCD561D8C697100070CB0 /* su-41-secdb-stress.c */; };
                DC0BCD751D8C6A1E00070CB0 /* iCloudKeychainTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */; };
                DC0BCD761D8C6A1E00070CB0 /* iCloudKeychainTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */; };

-               DC0BCD771D8C6A1E00070CB0 /* SecAKSWrappers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */; };
-               DC0BCD781D8C6A1E00070CB0 /* SecAKSWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */; };

                DC0BCD791D8C6A1E00070CB0 /* SecBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */; };
                DC0BCD7A1D8C6A1E00070CB0 /* SecBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */; };
                DC0BCD7B1D8C6A1E00070CB0 /* SecCoreCrypto.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */; };
                DC0BCD791D8C6A1E00070CB0 /* SecBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */; };
                DC0BCD7A1D8C6A1E00070CB0 /* SecBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */; };
                DC0BCD7B1D8C6A1E00070CB0 /* SecCoreCrypto.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */; };


@@ -2533,30 +3259,38 @@
                DC0BCDA91D8C6A1F00070CB0 /* SecFileLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */; };
                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */; };
                DC0BCDAB1D8C6A1F00070CB0 /* SecXPCError.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */; };
                DC0BCDA91D8C6A1F00070CB0 /* SecFileLocations.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */; };
                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */; };
                DC0BCDAB1D8C6A1F00070CB0 /* SecXPCError.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */; };

-               DC0BCDAC1D8C6A1F00070CB0 /* simulate_crash.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC711D8C68CF00070CB0 /* simulate_crash.c */; };
+               DC0BCDAC1D8C6A1F00070CB0 /* simulate_crash.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC711D8C68CF00070CB0 /* simulate_crash.m */; };

                DC0BCDAD1D8C6A1F00070CB0 /* SecSCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */; };
                DC0BCDAE1D8C6A1F00070CB0 /* SecSCTUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */; };
                DC0BCDAF1D8C6A1F00070CB0 /* SecAppleAnchor.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */; };
                DC0BCDB01D8C6A1F00070CB0 /* SecAppleAnchorPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC751D8C68CF00070CB0 /* SecAppleAnchorPriv.h */; };
                DC0BCDB21D8C6A1F00070CB0 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */; };
                DC0BCDAD1D8C6A1F00070CB0 /* SecSCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */; };
                DC0BCDAE1D8C6A1F00070CB0 /* SecSCTUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */; };
                DC0BCDAF1D8C6A1F00070CB0 /* SecAppleAnchor.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */; };
                DC0BCDB01D8C6A1F00070CB0 /* SecAppleAnchorPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC751D8C68CF00070CB0 /* SecAppleAnchorPriv.h */; };
                DC0BCDB21D8C6A1F00070CB0 /* SecInternalReleasePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */; };

-               DC0BCDB51D8C6A5B00070CB0 /* not_on_this_platorm.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */; };
+               DC0BD4F121BB05F2006B9154 /* CKKSKeychainBackedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BD4EF21BB05F2006B9154 /* CKKSKeychainBackedKey.h */; };
+               DC0BD4F521BB060F006B9154 /* CKKSKeychainBackedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */; };
+               DC0BD4F621BB0610006B9154 /* CKKSKeychainBackedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */; };
+               DC0C343821FA7DEB00417D04 /* SecEscrowRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = DC90A4C021F27680001300EB /* SecEscrowRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC0C343A21FA7DEB00417D04 /* SecEscrowRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = DC90A4C021F27680001300EB /* SecEscrowRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC0D16012363A1D6007F0951 /* OTSetCDPBitOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0D15FF2363A1D6007F0951 /* OTSetCDPBitOperation.h */; };
+               DC0D16022363A1D6007F0951 /* OTSetCDPBitOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0D16002363A1D6007F0951 /* OTSetCDPBitOperation.m */; };
+               DC0D16062363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0D16042363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h */; };
+               DC0D16072363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0D16052363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m */; };
+               DC0DE87123750340006E2EAE /* OTPairingMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE2A2214055CF003BFDB5 /* OTPairingMessage.m */; };
+               DC0EF8F2208697C600AB9E95 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0EF8F1208697C600AB9E95 /* main.swift */; };
+               DC0FA6B02291F63F00FE01C4 /* OctagonPendingFlag.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0FA6AE2291F63F00FE01C4 /* OctagonPendingFlag.h */; };
+               DC0FA6B12291F63F00FE01C4 /* OctagonPendingFlag.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0FA6AF2291F63F00FE01C4 /* OctagonPendingFlag.m */; };

                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 */; };
                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 */; };
+               DC13A11D211D1982000A80BC /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
+               DC13A11E211D1982000A80BC /* NSOperationCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1447951F5766D200236DB4 /* NSOperationCategories.m */; };

                DC14478A1F5764C600236DB4 /* CKKSResultOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1447881F5764C600236DB4 /* CKKSResultOperation.h */; };
                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 */; };
                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 */; };
                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 */; };
+               DC14C4C223AAACED007F673F /* Container_BottledPeers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */; };

                DC15F7661E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC15F7641E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h */; };
                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 */; };
                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */; };

-               DC15F7691E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F7651E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m */; };

                DC15F79C1E68EAD5003B9A40 /* CKKSTests+API.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */; };
                DC15F79C1E68EAD5003B9A40 /* CKKSTests+API.m in Sources */ = {isa = PBXBuildFile; fileRef = DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */; };

+               DC176232224C57D600BB9A6E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };

                DC1785161D77895A00B50D50 /* oidsalg.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785111D77895A00B50D50 /* oidsalg.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785171D77895A00B50D50 /* oidsattr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785121D77895A00B50D50 /* oidsattr.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785181D77895A00B50D50 /* SecAsn1Coder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785131D77895A00B50D50 /* SecAsn1Coder.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785161D77895A00B50D50 /* oidsalg.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785111D77895A00B50D50 /* oidsalg.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785171D77895A00B50D50 /* oidsattr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785121D77895A00B50D50 /* oidsattr.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785181D77895A00B50D50 /* SecAsn1Coder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785131D77895A00B50D50 /* SecAsn1Coder.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -2613,8 +3347,6 @@
                DC1785891D778B8000B50D50 /* SecCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785831D778B7F00B50D50 /* SecCode.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, ); }; };
                DC1785891D778B8000B50D50 /* SecCode.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785831D778B7F00B50D50 /* SecCode.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, ); }; };
-               DC1785911D778B9D00B50D50 /* CMSEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17858F1D778B9D00B50D50 /* CMSEncoder.h */; settings = {ATTRIBUTES = (Public, ); }; };

                DC1785921D778BE400B50D50 /* SecAccessControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 443381D918A3D81400215606 /* SecAccessControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785931D778BEE00B50D50 /* SecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C696B3709BFA94F000CBC75 /* SecBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785941D778BF400B50D50 /* SecPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CBA0E860BB33C0000E72B55 /* SecPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785921D778BE400B50D50 /* SecAccessControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 443381D918A3D81400215606 /* SecAccessControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785931D778BEE00B50D50 /* SecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C696B3709BFA94F000CBC75 /* SecBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC1785941D778BF400B50D50 /* SecPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CBA0E860BB33C0000E72B55 /* SecPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -2638,26 +3370,10 @@
                DC1786FA1D778F2500B50D50 /* SecTransformInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786F71D778F2500B50D50 /* SecTransformInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1786FC1D778F3D00B50D50 /* sslTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FB1D778F3C00B50D50 /* sslTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1786FE1D778F5000B50D50 /* SecureTransportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1786FA1D778F2500B50D50 /* SecTransformInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786F71D778F2500B50D50 /* SecTransformInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1786FC1D778F3D00B50D50 /* sslTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FB1D778F3C00B50D50 /* sslTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1786FE1D778F5000B50D50 /* SecureTransportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               DC1787111D778FA900B50D50 /* SecCMS.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787001D778FA900B50D50 /* SecCMS.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787121D778FAA00B50D50 /* SecCmsBase.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787011D778FA900B50D50 /* SecCmsBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787131D778FAA00B50D50 /* SecCmsContentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787021D778FA900B50D50 /* SecCmsContentInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787141D778FAA00B50D50 /* SecCmsDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787031D778FA900B50D50 /* SecCmsDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787151D778FAA00B50D50 /* SecCmsDigestContext.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787041D778FA900B50D50 /* SecCmsDigestContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787161D778FAA00B50D50 /* SecCmsDigestedData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787051D778FA900B50D50 /* SecCmsDigestedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787171D778FAA00B50D50 /* SecCmsEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787061D778FA900B50D50 /* SecCmsEncoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787181D778FAA00B50D50 /* SecCmsEncryptedData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787071D778FA900B50D50 /* SecCmsEncryptedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC1787191D778FAA00B50D50 /* SecCmsEnvelopedData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787081D778FA900B50D50 /* SecCmsEnvelopedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC17871A1D778FAA00B50D50 /* SecCmsMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787091D778FA900B50D50 /* SecCmsMessage.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC17871B1D778FAA00B50D50 /* SecCmsRecipientInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870A1D778FA900B50D50 /* SecCmsRecipientInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               DC17871C1D778FAA00B50D50 /* SecCmsSignedData.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17870B1D778FA900B50D50 /* SecCmsSignedData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               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, ); }; };

                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, ); }; };
                DC1787351D77903700B50D50 /* SecAccessPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787281D77903700B50D50 /* SecAccessPriv.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, ); }; };
                DC1787351D77903700B50D50 /* SecAccessPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787281D77903700B50D50 /* SecAccessPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               DC1787361D77903700B50D50 /* SecCertificateBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787291D77903700B50D50 /* SecCertificateBundle.h */; settings = {ATTRIBUTES = (Private, ); }; };

                DC1787371D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787381D77903700B50D50 /* SecIdentitySearchPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787391D77903700B50D50 /* SecKeychainItemExtendedAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787371D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787381D77903700B50D50 /* SecIdentitySearchPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787391D77903700B50D50 /* SecKeychainItemExtendedAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -2676,7 +3392,6 @@
                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, ); }; };
                DC1787561D7790A500B50D50 /* SecStaticCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17874C1D7790A500B50D50 /* SecStaticCodePriv.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, ); }; };
                DC1787561D7790A500B50D50 /* SecStaticCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17874C1D7790A500B50D50 /* SecStaticCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               DC1787591D7790B600B50D50 /* CMSPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787581D7790B600B50D50 /* CMSPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };

                DC17875C1D7790CE00B50D50 /* checkpw.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875B1D7790CE00B50D50 /* checkpw.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17875F1D7790E500B50D50 /* AuthorizationPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787601D7790E500B50D50 /* AuthorizationTagsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17875C1D7790CE00B50D50 /* checkpw.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875B1D7790CE00B50D50 /* checkpw.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17875F1D7790E500B50D50 /* AuthorizationPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787601D7790E500B50D50 /* AuthorizationTagsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -2689,7 +3404,6 @@
                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787671D77911D00B50D50 /* osKeyTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787711D77911D00B50D50 /* secasn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787681D77911D00B50D50 /* secasn1t.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787721D77911D00B50D50 /* X509Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787691D77911D00B50D50 /* X509Templates.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787671D77911D00B50D50 /* osKeyTemplates.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787711D77911D00B50D50 /* secasn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787681D77911D00B50D50 /* secasn1t.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787721D77911D00B50D50 /* X509Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787691D77911D00B50D50 /* X509Templates.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               DC1787741D77915500B50D50 /* SecBreadcrumb.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787731D77915500B50D50 /* SecBreadcrumb.h */; settings = {ATTRIBUTES = (Private, ); }; };

                DC1787751D77916000B50D50 /* SecAccessControlPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 443381DA18A3D81400215606 /* SecAccessControlPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787771D77916A00B50D50 /* SecDH.h in Headers */ = {isa = PBXBuildFile; fileRef = 7940D4110C3ACF9000FDB5D8 /* SecDH.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787751D77916000B50D50 /* SecAccessControlPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 443381DA18A3D81400215606 /* SecAccessControlPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC1787771D77916A00B50D50 /* SecDH.h in Headers */ = {isa = PBXBuildFile; fileRef = 7940D4110C3ACF9000FDB5D8 /* SecDH.h */; settings = {ATTRIBUTES = (Private, ); }; };


@@ -2709,8 +3423,6 @@
                DC1787851D7791CE00B50D50 /* SecTrustSettingsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17890B1D77980500B50D50 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC1789131D7798B300B50D50 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */; };
                DC1787851D7791CE00B50D50 /* SecTrustSettingsPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC17890B1D77980500B50D50 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC1789131D7798B300B50D50 /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */; };

-               DC1789151D77997F00B50D50 /* libOpenScriptingUtil.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
-               DC1789171D77998700B50D50 /* libauto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789161D77998700B50D50 /* libauto.dylib */; };

                DC1789191D77998C00B50D50 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789181D77998C00B50D50 /* libbsm.dylib */; };
                DC17891D1D77999700B50D50 /* libpam.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891C1D77999700B50D50 /* libpam.dylib */; };
                DC17891F1D77999D00B50D50 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };
                DC1789191D77998C00B50D50 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789181D77998C00B50D50 /* libbsm.dylib */; };
                DC17891D1D77999700B50D50 /* libpam.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891C1D77999700B50D50 /* libpam.dylib */; };
                DC17891F1D77999D00B50D50 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };


@@ -2721,10 +3433,8 @@
                DC1789281D779A0F00B50D50 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                DC1789291D779A2800B50D50 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
                DC17892A1D779A3200B50D50 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
                DC1789281D779A0F00B50D50 /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                DC1789291D779A2800B50D50 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
                DC17892A1D779A3200B50D50 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };

-               DC1789471D779AAF00B50D50 /* libsecurity_smime.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1784491D77869A00B50D50 /* libsecurity_smime.a */; };
-               DC1789A21D779DF400B50D50 /* SecBreadcrumb.c in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A01D779DEE00B50D50 /* SecBreadcrumb.c */; };

                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };
                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };

-               DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in CopyFiles */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };
+               DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };

                DC178A1F1D77A1E700B50D50 /* cssm.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */; };
                DC178A201D77A1E700B50D50 /* csp_capabilities.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0F1D77A1E700B50D50 /* csp_capabilities.mdsinfo */; };
                DC178A211D77A1E700B50D50 /* csp_capabilities_common.mds in Resources */ = {isa = PBXBuildFile; fileRef = DC178A101D77A1E700B50D50 /* csp_capabilities_common.mds */; };
                DC178A1F1D77A1E700B50D50 /* cssm.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */; };
                DC178A201D77A1E700B50D50 /* csp_capabilities.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0F1D77A1E700B50D50 /* csp_capabilities.mdsinfo */; };
                DC178A211D77A1E700B50D50 /* csp_capabilities_common.mds in Resources */ = {isa = PBXBuildFile; fileRef = DC178A101D77A1E700B50D50 /* csp_capabilities_common.mds */; };


@@ -2745,72 +3455,31 @@
                DC178A421D77A1F600B50D50 /* FDEPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC178A311D77A1F500B50D50 /* FDEPrefs.plist */; };
                DC178A431D77A1F600B50D50 /* SecDebugErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */; };
                DC178A441D77A1F600B50D50 /* SecErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */; };
                DC178A421D77A1F600B50D50 /* FDEPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC178A311D77A1F500B50D50 /* FDEPrefs.plist */; };
                DC178A431D77A1F600B50D50 /* SecDebugErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */; };
                DC178A441D77A1F600B50D50 /* SecErrorMessages.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */; };

-               DC178A451D77A1F600B50D50 /* framework.sb in Resources */ = {isa = PBXBuildFile; fileRef = DC178A351D77A1F500B50D50 /* framework.sb */; };

                DC178A471D77A1F600B50D50 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A381D77A1F500B50D50 /* InfoPlist.strings */; };
                DC178A481D77A1F600B50D50 /* TimeStampingPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */; };
                DC178A471D77A1F600B50D50 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A381D77A1F500B50D50 /* InfoPlist.strings */; };
                DC178A481D77A1F600B50D50 /* TimeStampingPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */; };

-               DC178A491D77A1F600B50D50 /* authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings */; };
+               DC178A491D77A1F600B50D50 /* authorization.dfr.prompts.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */; };

                DC178A4A1D77A1F600B50D50 /* authorization.buttons.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */; };
                DC178A4B1D77A1F600B50D50 /* authorization.prompts.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */; };
                DC18F76F1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */; };
                DC178A4A1D77A1F600B50D50 /* authorization.buttons.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */; };
                DC178A4B1D77A1F600B50D50 /* authorization.prompts.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */; };
                DC18F76F1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */; };

-               DC18F7701E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */; };

                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */; };
                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */; };

-               DC18F7721E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */; };
+               DC19484C21812EC5007C2260 /* OTDeviceInformationAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = DC19484A21812EC5007C2260 /* OTDeviceInformationAdapter.h */; };
+               DC19484D21812EC5007C2260 /* OTDeviceInformationAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC19484B21812EC5007C2260 /* OTDeviceInformationAdapter.m */; };

                DC1DA65E1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */; };
                DC1DA65E1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */; };

-               DC1DA65F1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */; };

                DC1DA6681E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1DA6671E4555D80094CE7F /* CKKSScanLocalItemsOperation.m */; };
                DC1DA6681E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1DA6671E4555D80094CE7F /* CKKSScanLocalItemsOperation.m */; };

-               DC1DA6691E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1DA6671E4555D80094CE7F /* CKKSScanLocalItemsOperation.m */; };
+               DC1E5AB623063A4E00918162 /* CKKSPeerProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1E5AB423063A4D00918162 /* CKKSPeerProvider.h */; };
+               DC1E5AB723063A4E00918162 /* CKKSPeerProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1E5AB523063A4E00918162 /* CKKSPeerProvider.m */; };

                DC1ED8C11DD5197E002BDCFA /* CKKSItemEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */; };
                DC1ED8C61DD55476002BDCFA /* CKKS.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8C51DD55476002BDCFA /* CKKS.m */; };
                DC1ED8C11DD5197E002BDCFA /* CKKSItemEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */; };
                DC1ED8C61DD55476002BDCFA /* CKKS.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8C51DD55476002BDCFA /* CKKS.m */; };

+               DC221BAB2267E2A60068DBCF /* OTUpdateTPHOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC221BA92267E2A60068DBCF /* OTUpdateTPHOperation.h */; };
+               DC221BAC2267E2A70068DBCF /* OTUpdateTPHOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC221BAA2267E2A60068DBCF /* OTUpdateTPHOperation.m */; };

                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                DC222C351E02418100B09171 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                DC222C351E02418100B09171 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };

-               DC222C3A1E034D1F00B09171 /* CKKSItemEncrypter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */; };
-               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.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 */; };
-               DC222C451E034D1F00B09171 /* CKKSIncomingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B3B1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m */; };
-               DC222C461E034D1F00B09171 /* SecItemDb.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C961D8085D800865A7C /* SecItemDb.c */; };
-               DC222C471E034D1F00B09171 /* SecItemSchema.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C981D8085D800865A7C /* SecItemSchema.c */; };
-               DC222C481E034D1F00B09171 /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
-               DC222C491E034D1F00B09171 /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
-               DC222C4A1E034D1F00B09171 /* SecLogSettingsServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CAE1D8085D800865A7C /* SecLogSettingsServer.m */; };
-               DC222C4D1E034D1F00B09171 /* CKKSOutgoingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */; };
-               DC222C4E1E034D1F00B09171 /* CKKS.m in Sources */ = {isa = PBXBuildFile; fileRef = DC1ED8C51DD55476002BDCFA /* CKKS.m */; };
-               DC222C501E034D1F00B09171 /* SecOTRRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB41D8085D800865A7C /* SecOTRRemote.m */; };
-               DC222C511E034D1F00B09171 /* CKKSItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */; };
-               DC222C541E034D1F00B09171 /* CKKSSQLDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */; };
-               DC222C571E034D1F00B09171 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
-               DC222C5A1E034D1F00B09171 /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB31D8085D800865A7C /* iCloudTrace.c */; };
-               DC222C5D1E034D1F00B09171 /* CKKSMirrorEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B2E1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m */; };
-               DC222C611E034D1F00B09171 /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
-               DC222C621E034D1F00B09171 /* CKKSZoneStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B371DEFADB500A3DAFA /* CKKSZoneStateEntry.m */; };
-               DC222C651E034D1F00B09171 /* SOSChangeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D501D8085F200865A7C /* SOSChangeTracker.h */; };
-               DC222C661E034D1F00B09171 /* SOSEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D571D8085F200865A7C /* SOSEngine.h */; };
-               DC222C671E034D1F00B09171 /* SecDbKeychainItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C911D8085D800865A7C /* SecDbKeychainItem.h */; };
-               DC222C681E034D1F00B09171 /* SecDbQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C931D8085D800865A7C /* SecDbQuery.h */; };
-               DC222C691E034D1F00B09171 /* CKKSMirrorEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */; };
-               DC222C6A1E034D1F00B09171 /* CKKSZoneStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */; };
-               DC222C6B1E034D1F00B09171 /* SecItemDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C951D8085D800865A7C /* SecItemDataSource.h */; };
-               DC222C6C1E034D1F00B09171 /* CKKSIncomingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B3A1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h */; };
-               DC222C6D1E034D1F00B09171 /* SecItemDb.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C971D8085D800865A7C /* SecItemDb.h */; };
-               DC222C6E1E034D1F00B09171 /* SecItemSchema.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C991D8085D800865A7C /* SecItemSchema.h */; };
-               DC222C6F1E034D1F00B09171 /* SecKeybagSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C9F1D8085D800865A7C /* SecKeybagSupport.h */; };
-               DC222C701E034D1F00B09171 /* iCloudTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78CB21D8085D800865A7C /* iCloudTrace.h */; };
-               DC222C711E034D1F00B09171 /* CKKSOutgoingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */; };
-               DC222C731E034D1F00B09171 /* CKKSItem.h in Headers */ = {isa = PBXBuildFile; fileRef = DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */; };
-               DC222C7A1E034EF700B09171 /* libsecurityd_ios_NO_AKS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */; };

                DC222C8A1E089BAE00B09171 /* CKKSSQLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222C891E089BAE00B09171 /* CKKSSQLTests.m */; };
                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
                DC222C8A1E089BAE00B09171 /* CKKSSQLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222C891E089BAE00B09171 /* CKKSSQLTests.m */; };
                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };

-               DC2353291ECA658300D7C1BE /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
-               DC23532F1ECA658400D7C1BE /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
-               DC2353301ECA658900D7C1BE /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.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 */; };
+               DC25B3AC233C2EBC00CB1409 /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };
+               DC26666A21CAC32700F19960 /* OTControlCLI.m in Sources */ = {isa = PBXBuildFile; fileRef = DC26666921CAC32700F19960 /* OTControlCLI.m */; };
+               DC26666C21CAC97000F19960 /* OTControlCLI.m in Sources */ = {isa = PBXBuildFile; fileRef = DC26666921CAC32700F19960 /* OTControlCLI.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 */; };
                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 */; };


@@ -2820,35 +3489,66 @@
                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, ); }; };
                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 */; };
+               DC26710E1F3E932D00816EED /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };
+               DC27C3C120EAD9C300F7839C /* OctagonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC27C3C020EAD9C300F7839C /* OctagonTests.swift */; };
+               DC27C3C920EADEE700F7839C /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
+               DC27C3CA20EADF1700F7839C /* CloudKitKeychainSyncingTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CA4EBF2202B8D1D002B1D96 /* CloudKitKeychainSyncingTestsBase.m */; };
+               DC27C3CB20EADF3500F7839C /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
+               DC27C3CE20EAFE9C00F7839C /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
+               DC2819B922F8F6FE007829F5 /* OctagonTests+DeviceList.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC2819B822F8F6FE007829F5 /* OctagonTests+DeviceList.swift */; };
+               DC2B757621F2A270003C9356 /* SecEscrowRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90A4C121F27680001300EB /* SecEscrowRequest.m */; };
+               DC2B757721F2A272003C9356 /* SecEscrowRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC90A4C121F27680001300EB /* SecEscrowRequest.m */; };
+               DC2B9A5223147A3800D4C79D /* TPMachineID.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2B9A5023147A3800D4C79D /* TPMachineID.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               DC2B9A5323147A3800D4C79D /* TPMachineID.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2B9A5123147A3800D4C79D /* TPMachineID.m */; };

                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 */; };
                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 */; };

-               DC2C5F5E1F0EB97E00FEBDA7 /* CKKSNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */; };

                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */; };
                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */; };

-               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 */; };
+               DC2FA71120E5770400DB7518 /* OTClique.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F336A20DD643B0031A92D /* OTClique.m */; };
+               DC2FA72520E57AB500DB7518 /* SOSPeerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D631D8085F200865A7C /* SOSPeerInfo.m */; };
+               DC2FA72A20E57BFD00DB7518 /* SOSAccountTrust.m in Sources */ = {isa = PBXBuildFile; fileRef = CD31F8601DCD4C1400414B46 /* SOSAccountTrust.m */; };
+               DC2FA72B20E57C1000DB7518 /* SOSAccountTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = CD31F8611DCD4C1400414B46 /* SOSAccountTrust.h */; };
+               DC311E682124A9E1002F5EAE /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               DC311E7A2124B8EF002F5EAE /* aks_real_witness.h in Headers */ = {isa = PBXBuildFile; fileRef = DC311E782124B8EF002F5EAE /* aks_real_witness.h */; };
+               DC311E7B2124B8EF002F5EAE /* aks_real_witness.c in Sources */ = {isa = PBXBuildFile; fileRef = DC311E792124B8EF002F5EAE /* aks_real_witness.c */; };

                DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = 18351B8F14CB65870097860E /* SecBase64.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */ = {isa = PBXBuildFile; fileRef = 18351B8F14CB65870097860E /* SecBase64.h */; settings = {ATTRIBUTES = (Private, ); }; };

+               DC33D7BD2374FD0500A68155 /* OTSponsorToApplicantRound1M2.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE28D214054F6003BFDB5 /* OTSponsorToApplicantRound1M2.m */; };
+               DC33D7BE2374FD0A00A68155 /* OTSponsorToApplicantRound2M2.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE290214054F7003BFDB5 /* OTSponsorToApplicantRound2M2.m */; };
+               DC340C54208E828F004D7EEC /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };

                DC3502B81E0208BE00BC0587 /* CKKSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502B71E0208BE00BC0587 /* CKKSTests.m */; };
                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 */; };
+               DC3502C51E020D5100BC0587 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
                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 */; };
                DC3502D21E02113900BC0587 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };

-               DC3502D31E02115200BC0587 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
-               DC3502D61E02118000BC0587 /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };

                DC3502DF1E02129F00BC0587 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                DC3502DF1E02129F00BC0587 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

-               DC3502E21E0212D100BC0587 /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };

                DC3502E31E0212E600BC0587 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                DC3502E31E0212E600BC0587 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };

-               DC3502E41E02130600BC0587 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };

                DC3502E71E0214C800BC0587 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
                DC3502E91E02172C00BC0587 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
                DC3502E71E0214C800BC0587 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
                DC3502E91E02172C00BC0587 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };

+               DC36895821235F23003A3735 /* SecAKSWrappers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */; };
+               DC36895921235F2A003A3735 /* SecAKSWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */; };
+               DC36896221235F99003A3735 /* mockaks.m in Sources */ = {isa = PBXBuildFile; fileRef = EB49B2E4202DFE7F003F34A0 /* mockaks.m */; };
+               DC36896321235FA2003A3735 /* mockaks.h in Headers */ = {isa = PBXBuildFile; fileRef = EB49B303202FB8DE003F34A0 /* mockaks.h */; };
+               DC372C8C22B4501900AB9F41 /* SecCoreAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE8258F2193353300102304 /* SecCoreAnalytics.m */; };
+               DC372C8D22B4501900AB9F41 /* SecCoreAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE8258F2193353300102304 /* SecCoreAnalytics.m */; };
+               DC372C8E22B4509100AB9F41 /* SecCoreAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = EBE8258E2193353300102304 /* SecCoreAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC372C8F22B4509200AB9F41 /* SecCoreAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = EBE8258E2193353300102304 /* SecCoreAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };

                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */; };
                DC378B2F1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B2E1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m */; };
                DC378B381DEFADB500A3DAFA /* CKKSZoneStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */; };
                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 */; };
                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */; };
                DC378B2F1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC378B2E1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m */; };
                DC378B381DEFADB500A3DAFA /* CKKSZoneStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */; };
                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 */; };

+               DC391F8A21BF222500772585 /* CKKSKeychainBackedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */; };
+               DC391F8C21BF222B00772585 /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */; };
+               DC391F8D21BF244000772585 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
+               DC391F8E21BF274600772585 /* CKKSPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */; };
+               DC391F8F21BF284D00772585 /* CKKSSerializedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */; };
+               DC391F9D21BF2F8100772585 /* CKKSConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DC391F9921BF2F4B00772585 /* CKKSConstants.m */; };
+               DC391F9E21BF2F8700772585 /* CKKSConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DC391F9921BF2F4B00772585 /* CKKSConstants.m */; };
+               DC391F9F21BF2F8700772585 /* CKKSConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DC391F9921BF2F4B00772585 /* CKKSConstants.m */; };
+               DC391FA621C04D1500772585 /* OctagonPeerKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */; };
+               DC391FA721C04D6800772585 /* OctagonPeerKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */; };
+               DC391FA821C04DAE00772585 /* OctagonPeerKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */; };
+               DC391FAE21C1903E00772585 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

                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 */; };
                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 */; };


@@ -2861,6 +3561,39 @@
                DC3A81D61D99D57F000C7419 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                DC3A81D71D99D58A000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */; };
                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                DC3A81D61D99D57F000C7419 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };
                DC3A81D71D99D58A000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */; };
                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFC029B1D41650700E6283B /* libcoretls.dylib */; };

+               DC3A9B2723A9D8BD0073ED06 /* Container_BottledPeers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */; };
+               DC3A9B2823A9D8C40073ED06 /* Container_BottledPeers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */; };
+               DC3AA2782097DF70007CA68A /* readline.c in Sources */ = {isa = PBXBuildFile; fileRef = DC65E7BE1D8CBB1500152EF0 /* readline.c */; };
+               DC3AA2792097DF71007CA68A /* readline.c in Sources */ = {isa = PBXBuildFile; fileRef = DC65E7BE1D8CBB1500152EF0 /* readline.c */; };
+               DC3AA27A2097DF84007CA68A /* not_on_this_platorm.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */; };
+               DC3AA27B2097DF85007CA68A /* not_on_this_platorm.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */; };
+               DC3AA27D2097E206007CA68A /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E191D8085FC00865A7C /* verify_cert.c */; };
+               DC3AA27E2097E207007CA68A /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E191D8085FC00865A7C /* verify_cert.c */; };
+               DC3AA27F2097E20A007CA68A /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1A1D8085FC00865A7C /* keychain_util.c */; };
+               DC3AA2802097E20B007CA68A /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1A1D8085FC00865A7C /* keychain_util.c */; };
+               DC3AA2812097E216007CA68A /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1C1D8085FC00865A7C /* add_internet_password.c */; };
+               DC3AA2822097E218007CA68A /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1C1D8085FC00865A7C /* add_internet_password.c */; };
+               DC3AA2832097E21C007CA68A /* log_control.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1D1D8085FC00865A7C /* log_control.c */; };
+               DC3AA2842097E21D007CA68A /* log_control.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1D1D8085FC00865A7C /* log_control.c */; };
+               DC3AA2852097E22A007CA68A /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1E1D8085FC00865A7C /* codesign.c */; };
+               DC3AA2862097E22A007CA68A /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1E1D8085FC00865A7C /* codesign.c */; };
+               DC3AA2872097E231007CA68A /* keychain_add.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1F1D8085FC00865A7C /* keychain_add.c */; };
+               DC3AA2882097E232007CA68A /* keychain_add.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1F1D8085FC00865A7C /* keychain_add.c */; };
+               DC3AA2892097E23A007CA68A /* keychain_find.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E201D8085FC00865A7C /* keychain_find.m */; };
+               DC3AA28A2097E23B007CA68A /* keychain_find.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E201D8085FC00865A7C /* keychain_find.m */; };
+               DC3AA28B2097E23F007CA68A /* pkcs12_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E221D8085FC00865A7C /* pkcs12_util.c */; };
+               DC3AA28C2097E23F007CA68A /* pkcs12_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E221D8085FC00865A7C /* pkcs12_util.c */; };
+               DC3AA28D2097E24B007CA68A /* scep.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E231D8085FC00865A7C /* scep.c */; };
+               DC3AA28E2097E24C007CA68A /* scep.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E231D8085FC00865A7C /* scep.c */; };
+               DC3AA28F2097E253007CA68A /* show_certificates.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E251D8085FC00865A7C /* show_certificates.c */; };
+               DC3AA2902097E254007CA68A /* show_certificates.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E251D8085FC00865A7C /* show_certificates.c */; };
+               DC3AA2912097E25B007CA68A /* trust_update.m in Sources */ = {isa = PBXBuildFile; fileRef = D453C38A1FEC669300DE349B /* trust_update.m */; };
+               DC3AA2922097E25C007CA68A /* trust_update.m in Sources */ = {isa = PBXBuildFile; fileRef = D453C38A1FEC669300DE349B /* trust_update.m */; };
+               DC3AA2932097E263007CA68A /* spc.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E261D8085FC00865A7C /* spc.c */; };
+               DC3AA2942097E264007CA68A /* spc.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E261D8085FC00865A7C /* spc.c */; };
+               DC3AF52C2229E6C0006577E8 /* CKKSListenerCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3AF52A2229E6C0006577E8 /* CKKSListenerCollection.h */; };
+               DC3AF52D2229E6C0006577E8 /* CKKSListenerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3AF52B2229E6C0006577E8 /* CKKSListenerCollection.m */; };
+               DC3AF52F2229E770006577E8 /* CKKSListenerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3AF52B2229E6C0006577E8 /* CKKSListenerCollection.m */; };

                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
                DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };
                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */; };
                DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };


@@ -2882,11 +3615,9 @@
                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, ); }; };
                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1786FB1D778F3C00B50D50 /* sslTypes.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, ); }; };
                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 */; };
                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 */; };
                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };

-               DC3D748F1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
+               DC3E18C82125015300073D80 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };

                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 */; };
                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 */; };


@@ -2895,22 +3626,35 @@
                DC4269011E82038D002B7110 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC4269041E82EDAC002B7110 /* SecItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269031E82EDAC002B7110 /* SecItem.m */; };
                DC4269051E82EDC4002B7110 /* SecItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269031E82EDAC002B7110 /* SecItem.m */; };
                DC4269011E82038D002B7110 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC4269041E82EDAC002B7110 /* SecItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269031E82EDAC002B7110 /* SecItem.m */; };
                DC4269051E82EDC4002B7110 /* SecItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269031E82EDAC002B7110 /* SecItem.m */; };

-               DC4269081E82FD8B002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC4269091E82FD8C002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC42690C1E82FD9A002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC42690D1E82FD9B002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC42690F1E82FD9C002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC4269101E82FD9F002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC4269111E82FDA0002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               DC4269121E82FDA1002B7110 /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
+               DC4269081E82FD8B002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC4269091E82FD8C002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC42690C1E82FD9A002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC42690D1E82FD9B002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC42690F1E82FD9C002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC4269101E82FD9F002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC4269111E82FDA0002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC4269121E82FDA1002B7110 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC4415B423610BF40087981C /* OctagonTests+Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4415B323610BF40087981C /* OctagonTests+Account.swift */; };
+               DC45D43D22EB619D00CEB6B7 /* OctagonStateMachineObservers.h in Headers */ = {isa = PBXBuildFile; fileRef = DC45D43B22EB619D00CEB6B7 /* OctagonStateMachineObservers.h */; };
+               DC45D43E22EB619D00CEB6B7 /* OctagonStateMachineObservers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC45D43C22EB619D00CEB6B7 /* OctagonStateMachineObservers.m */; };
+               DC4A73C5235E69D800DB1E6E /* OTApplicantToSponsorRound2M1.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C9AE28E214054F6003BFDB5 /* OTApplicantToSponsorRound2M1.m */; };
+               DC4A76A02212676D006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4A76A3221267D4006F2D8F /* EscrowRequestServerHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4A76A2221267D4006F2D8F /* EscrowRequestServerHelpers.m */; };
+               DC4A76A5221268A6006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4A76A62212691F006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4A76AB221269B8006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC4A76A92212698B006F2D8F /* CloudServices.framework */; };
+               DC4A76AC221269E4006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4A76AD22126A17006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4A76AE22126C49006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DC4CD9842372294E00EF55FC /* OctagonTests+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC4CD9822372294D00EF55FC /* OctagonTests+Helpers.swift */; };

                DC4DB1501E24692100CD6769 /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };
                DC4DB1501E24692100CD6769 /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };

-               DC4DB1511E24692100CD6769 /* CKKSKey.h in Headers */ = {isa = PBXBuildFile; fileRef = DC4DB14E1E24692100CD6769 /* CKKSKey.h */; };

                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB14F1E24692100CD6769 /* CKKSKey.m */; };
                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB14F1E24692100CD6769 /* CKKSKey.m */; };

-               DC4DB1531E24692100CD6769 /* CKKSKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4DB14F1E24692100CD6769 /* CKKSKey.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 */; };
                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 */; };

+               DC5060EB20E2D88300925005 /* OTCuttlefishContext.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5060E920E2D88300925005 /* OTCuttlefishContext.h */; };
+               DC5060ED20E2D88300925005 /* OTCuttlefishContext.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5060EA20E2D88300925005 /* OTCuttlefishContext.m */; };

                DC52E7C41D80BCAD00B0A59C /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C8E1D8085D800865A7C /* SecDbItem.c */; };
                DC52E7C51D80BCB300B0A59C /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */; };
                DC52E7C41D80BCAD00B0A59C /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C8E1D8085D800865A7C /* SecDbItem.c */; };
                DC52E7C51D80BCB300B0A59C /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */; };


@@ -2980,40 +3724,16 @@
                DC52E9331D80C4E500B0A59C /* SOSDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D531D8085F200865A7C /* SOSDataSource.h */; };
                DC52E9381D80C50800B0A59C /* SOSPeer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D5D1D8085F200865A7C /* SOSPeer.h */; };
                DC52EA9C1D80CC8300B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
                DC52E9331D80C4E500B0A59C /* SOSDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D531D8085F200865A7C /* SOSDataSource.h */; };
                DC52E9381D80C50800B0A59C /* SOSPeer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D5D1D8085F200865A7C /* SOSPeer.h */; };
                DC52EA9C1D80CC8300B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };

-               DC52EA9D1D80CC9700B0A59C /* syncbubble.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA921D80CC2A00B0A59C /* syncbubble.m */; };
-               DC52EA9E1D80CC9B00B0A59C /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA931D80CC2A00B0A59C /* leaks.c */; };
-               DC52EA9F1D80CCA100B0A59C /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */; };
-               DC52EAA01D80CCA700B0A59C /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA911D80CC2A00B0A59C /* whoami.m */; };
-               DC52EAA11D80CCAC00B0A59C /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA981D80CC2A00B0A59C /* SecurityTool.c */; };
-               DC52EAA21D80CCB200B0A59C /* keychain_backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E211D8085FC00865A7C /* keychain_backup.c */; };
-               DC52EAA31D80CCC300B0A59C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               DC52EBC31D80CEBA00B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };

                DC52EBC41D80CEBA00B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
                DC52EBC51D80CEBA00B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
                DC52EBC41D80CEBA00B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
                DC52EBC51D80CEBA00B0A59C /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };

-               DC52EBD01D80CEF100B0A59C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               DC52EC141D80CF0500B0A59C /* spc.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E261D8085FC00865A7C /* spc.c */; };
-               DC52EC151D80CF0B00B0A59C /* show_certificates.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E251D8085FC00865A7C /* show_certificates.c */; };
-               DC52EC161D80CF3B00B0A59C /* scep.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E231D8085FC00865A7C /* scep.c */; };
-               DC52EC171D80CF4200B0A59C /* pkcs12_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E221D8085FC00865A7C /* pkcs12_util.c */; };
-               DC52EC181D80CF4700B0A59C /* log_control.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1D1D8085FC00865A7C /* log_control.c */; };
-               DC52EC191D80CF4C00B0A59C /* keychain_find.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E201D8085FC00865A7C /* keychain_find.m */; };
-               DC52EC1A1D80CF5100B0A59C /* keychain_add.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1F1D8085FC00865A7C /* keychain_add.c */; };
-               DC52EC1B1D80CF5600B0A59C /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1E1D8085FC00865A7C /* codesign.c */; };
-               DC52EC1C1D80CF5D00B0A59C /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1C1D8085FC00865A7C /* add_internet_password.c */; };
-               DC52EC1D1D80CF6200B0A59C /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E1A1D8085FC00865A7C /* keychain_util.c */; };
-               DC52EC1E1D80CF6700B0A59C /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E191D8085FC00865A7C /* verify_cert.c */; };
-               DC52EC2F1D80CFB200B0A59C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

                DC52EC361D80CFD000B0A59C /* keychain_sync.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D971D8085F200865A7C /* keychain_sync.m */; };
                DC52EC371D80CFD400B0A59C /* keychain_sync_test.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D991D8085F200865A7C /* keychain_sync_test.m */; };
                DC52EC381D80CFDB00B0A59C /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D931D8085F200865A7C /* secToolFileIO.c */; };
                DC52EC391D80CFDF00B0A59C /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.c */; };
                DC52EC3A1D80CFE400B0A59C /* keychain_log.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9B1D8085F200865A7C /* keychain_log.m */; };
                DC52EC361D80CFD000B0A59C /* keychain_sync.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D971D8085F200865A7C /* keychain_sync.m */; };
                DC52EC371D80CFD400B0A59C /* keychain_sync_test.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D991D8085F200865A7C /* keychain_sync_test.m */; };
                DC52EC381D80CFDB00B0A59C /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D931D8085F200865A7C /* secToolFileIO.c */; };
                DC52EC391D80CFDF00B0A59C /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.c */; };
                DC52EC3A1D80CFE400B0A59C /* keychain_log.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9B1D8085F200865A7C /* keychain_log.m */; };

-               DC52EC3B1D80CFE900B0A59C /* syncbackup.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9D1D8085F200865A7C /* syncbackup.m */; };

                DC52EC4E1D80D01F00B0A59C /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                DC52EC4F1D80D02400B0A59C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DC52EC5D1D80D06300B0A59C /* SecLogging.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E651D8085FC00865A7C /* SecLogging.c */; };
                DC52EC4E1D80D01F00B0A59C /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                DC52EC4F1D80D02400B0A59C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DC52EC5D1D80D06300B0A59C /* SecLogging.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E651D8085FC00865A7C /* SecLogging.c */; };

-               DC52EC6B1D80D0E300B0A59C /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC6A1D80D0E300B0A59C /* IDSFoundation.framework */; };
-               DC52EC6C1D80D0E800B0A59C /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD744683195A00BB00FB01C0 /* IDS.framework */; };

                DC52EC6D1D80D0F100B0A59C /* sc-31-peerinfo-simplefuzz.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D001D8085F200865A7C /* sc-31-peerinfo-simplefuzz.c */; };
                DC52EC6E1D80D0F700B0A59C /* SOSTestDevice.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0E1D8085F200865A7C /* SOSTestDevice.c */; };
                DC52EC6F1D80D11800B0A59C /* sc-25-soskeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CFE1D8085F200865A7C /* sc-25-soskeygen.c */; };
                DC52EC6D1D80D0F100B0A59C /* sc-31-peerinfo-simplefuzz.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D001D8085F200865A7C /* sc-31-peerinfo-simplefuzz.c */; };
                DC52EC6E1D80D0F700B0A59C /* SOSTestDevice.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0E1D8085F200865A7C /* SOSTestDevice.c */; };
                DC52EC6F1D80D11800B0A59C /* sc-25-soskeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CFE1D8085F200865A7C /* sc-25-soskeygen.c */; };


@@ -3022,7 +3742,6 @@
                DC52EC731D80D12E00B0A59C /* sc-20-keynames.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CFD1D8085F200865A7C /* sc-20-keynames.m */; };
                DC52EC741D80D13500B0A59C /* SOSTestDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0C1D8085F200865A7C /* SOSTestDataSource.c */; };
                DC52EC751D80D13B00B0A59C /* sc-42-circlegencount.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */; };
                DC52EC731D80D12E00B0A59C /* sc-20-keynames.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CFD1D8085F200865A7C /* sc-20-keynames.m */; };
                DC52EC741D80D13500B0A59C /* SOSTestDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0C1D8085F200865A7C /* SOSTestDataSource.c */; };
                DC52EC751D80D13B00B0A59C /* sc-42-circlegencount.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */; };

-               DC52EC761D80D13F00B0A59C /* sc-150-ring.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D061D8085F200865A7C /* sc-150-ring.m */; };

                DC52EC771D80D14400B0A59C /* sc-130-resignationticket.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */; };
                DC52EC781D80D14800B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };
                DC52EC791D80D14D00B0A59C /* sc-45-digestvector.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D031D8085F200865A7C /* sc-45-digestvector.c */; };
                DC52EC771D80D14400B0A59C /* sc-130-resignationticket.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */; };
                DC52EC781D80D14800B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };
                DC52EC791D80D14D00B0A59C /* sc-45-digestvector.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D031D8085F200865A7C /* sc-45-digestvector.c */; };


@@ -3071,12 +3790,8 @@
                DC52ECE81D80D2FA00B0A59C /* pbkdf2-00-hmac-sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DA41D8085FC00865A7C /* pbkdf2-00-hmac-sha1.c */; };
                DC52ECE91D80D2FA00B0A59C /* spbkdf-00-hmac-sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DA51D8085FC00865A7C /* spbkdf-00-hmac-sha1.c */; };
                DC52ECEA1D80D30900B0A59C /* so_01_serverencryption.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E171D8085FC00865A7C /* so_01_serverencryption.c */; };
                DC52ECE81D80D2FA00B0A59C /* pbkdf2-00-hmac-sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DA41D8085FC00865A7C /* pbkdf2-00-hmac-sha1.c */; };
                DC52ECE91D80D2FA00B0A59C /* spbkdf-00-hmac-sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DA51D8085FC00865A7C /* spbkdf-00-hmac-sha1.c */; };
                DC52ECEA1D80D30900B0A59C /* so_01_serverencryption.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E171D8085FC00865A7C /* so_01_serverencryption.c */; };

-               DC52ED9E1D80D4ED00B0A59C /* secd-95-escrow-persistence.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C741D8085D800865A7C /* secd-95-escrow-persistence.m */; };

                DC52ED9F1D80D4F200B0A59C /* SOSTransportTestTransports.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C7C1D8085D800865A7C /* SOSTransportTestTransports.m */; };
                DC52EDA01D80D4F700B0A59C /* sd-10-policytree.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3D1D8085D800865A7C /* sd-10-policytree.m */; };
                DC52ED9F1D80D4F200B0A59C /* SOSTransportTestTransports.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C7C1D8085D800865A7C /* SOSTransportTestTransports.m */; };
                DC52EDA01D80D4F700B0A59C /* sd-10-policytree.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3D1D8085D800865A7C /* sd-10-policytree.m */; };

-               DC52EDA11D80D4FC00B0A59C /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD744683195A00BB00FB01C0 /* IDS.framework */; };
-               DC52EDAC1D80D58400B0A59C /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD744683195A00BB00FB01C0 /* IDS.framework */; };
-               DC52EDB21D80D59700B0A59C /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC6A1D80D0E300B0A59C /* IDSFoundation.framework */; };

                DC52EDB51D80D5C500B0A59C /* secd-03-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C391D8085D800865A7C /* secd-03-corrupted-items.m */; };
                DC52EDB61D80D5C500B0A59C /* secd-04-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3A1D8085D800865A7C /* secd-04-corrupted-items.m */; };
                DC52EDB71D80D5C500B0A59C /* secd-05-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3B1D8085D800865A7C /* secd-05-corrupted-items.m */; };
                DC52EDB51D80D5C500B0A59C /* secd-03-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C391D8085D800865A7C /* secd-03-corrupted-items.m */; };
                DC52EDB61D80D5C500B0A59C /* secd-04-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3A1D8085D800865A7C /* secd-04-corrupted-items.m */; };
                DC52EDB71D80D5C500B0A59C /* secd-05-corrupted-items.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C3B1D8085D800865A7C /* secd-05-corrupted-items.m */; };


@@ -3085,7 +3800,6 @@
                DC52EDBD1D80D5C500B0A59C /* secd-20-keychain_upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */; };
                DC52EDBE1D80D5C500B0A59C /* secd-21-transmogrify.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */; };
                DC52EDBF1D80D5C500B0A59C /* secd-30-keychain-upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */; };
                DC52EDBD1D80D5C500B0A59C /* secd-20-keychain_upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */; };
                DC52EDBE1D80D5C500B0A59C /* secd-21-transmogrify.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */; };
                DC52EDBF1D80D5C500B0A59C /* secd-30-keychain-upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */; };

-               DC52EDC01D80D5C500B0A59C /* secd-31-keychain-bad.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C441D8085D800865A7C /* secd-31-keychain-bad.m */; };

                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */; };
                DC52EDC21D80D5C500B0A59C /* secd-32-restore-bad-backup.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */; };
                DC52EDC31D80D5C500B0A59C /* secd-33-keychain-ctk.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */; };
                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */; };
                DC52EDC21D80D5C500B0A59C /* secd-32-restore-bad-backup.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */; };
                DC52EDC31D80D5C500B0A59C /* secd-33-keychain-ctk.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */; };


@@ -3133,40 +3847,25 @@
                DC52EDF81D80D65C00B0A59C /* SOSTestDevice.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0E1D8085F200865A7C /* SOSTestDevice.c */; };
                DC52EDF91D80D66000B0A59C /* SOSTestDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0C1D8085F200865A7C /* SOSTestDataSource.c */; };
                DC52EDFA1D80D66600B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };
                DC52EDF81D80D65C00B0A59C /* SOSTestDevice.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0E1D8085F200865A7C /* SOSTestDevice.c */; };
                DC52EDF91D80D66000B0A59C /* SOSTestDataSource.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0C1D8085F200865A7C /* SOSTestDataSource.c */; };
                DC52EDFA1D80D66600B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };

-               DC52EE421D80D71900B0A59C /* si-20-sectrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBB1D8085FC00865A7C /* si-20-sectrust.c */; };

                DC52EE441D80D71900B0A59C /* si-21-sectrust-asr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */; };
                DC52EE451D80D71900B0A59C /* si-22-sectrust-iap.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */; };
                DC52EE441D80D71900B0A59C /* si-21-sectrust-asr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */; };
                DC52EE451D80D71900B0A59C /* si-22-sectrust-iap.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */; };

-               DC52EE471D80D71900B0A59C /* si-23-sectrust-ocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC01D8085FC00865A7C /* si-23-sectrust-ocsp.c */; };

                DC52EE481D80D71900B0A59C /* si-24-sectrust-digicert-malaysia.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */; };
                DC52EE491D80D71900B0A59C /* si-24-sectrust-diginotar.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */; };
                DC52EE4A1D80D71900B0A59C /* si-24-sectrust-itms.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */; };
                DC52EE481D80D71900B0A59C /* si-24-sectrust-digicert-malaysia.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */; };
                DC52EE491D80D71900B0A59C /* si-24-sectrust-diginotar.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */; };
                DC52EE4A1D80D71900B0A59C /* si-24-sectrust-itms.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */; };

-               DC52EE4B1D80D71900B0A59C /* si-24-sectrust-nist.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC41D8085FC00865A7C /* si-24-sectrust-nist.c */; };

                DC52EE4C1D80D71900B0A59C /* si-24-sectrust-passbook.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */; };
                DC52EE4D1D80D71900B0A59C /* si-26-sectrust-copyproperties.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */; };
                DC52EE4C1D80D71900B0A59C /* si-24-sectrust-passbook.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */; };
                DC52EE4D1D80D71900B0A59C /* si-26-sectrust-copyproperties.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */; };

-               DC52EE4E1D80D71900B0A59C /* si-27-sectrust-exceptions.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC71D8085FC00865A7C /* si-27-sectrust-exceptions.c */; };
-               DC52EE4F1D80D71900B0A59C /* si-28-sectrustsettings.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC81D8085FC00865A7C /* si-28-sectrustsettings.m */; };
-               DC52EE511D80D73800B0A59C /* si-15-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DB71D8085FC00865A7C /* si-15-certificate.c */; };
-               DC52EE521D80D73800B0A59C /* si-16-ec-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DB81D8085FC00865A7C /* si-16-ec-certificate.c */; };

                DC52EE531D80D73800B0A59C /* si-44-seckey-gen.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD31D8085FC00865A7C /* si-44-seckey-gen.m */; };
                DC52EE541D80D73800B0A59C /* si-44-seckey-rsa.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD41D8085FC00865A7C /* si-44-seckey-rsa.m */; };
                DC52EE551D80D73800B0A59C /* si-44-seckey-ec.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD51D8085FC00865A7C /* si-44-seckey-ec.m */; };
                DC52EE561D80D73800B0A59C /* si-44-seckey-ies.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD61D8085FC00865A7C /* si-44-seckey-ies.m */; };
                DC52EE531D80D73800B0A59C /* si-44-seckey-gen.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD31D8085FC00865A7C /* si-44-seckey-gen.m */; };
                DC52EE541D80D73800B0A59C /* si-44-seckey-rsa.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD41D8085FC00865A7C /* si-44-seckey-rsa.m */; };
                DC52EE551D80D73800B0A59C /* si-44-seckey-ec.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD51D8085FC00865A7C /* si-44-seckey-ec.m */; };
                DC52EE561D80D73800B0A59C /* si-44-seckey-ies.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DD61D8085FC00865A7C /* si-44-seckey-ies.m */; };

-               DC52EE571D80D73800B0A59C /* si-67-sectrust-blocklist.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DF71D8085FC00865A7C /* si-67-sectrust-blocklist.c */; };

                DC52EE581D80D73800B0A59C /* si-70-sectrust-unified.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */; };
                DC52EE581D80D73800B0A59C /* si-70-sectrust-unified.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */; };

-               DC52EE591D80D73800B0A59C /* si-82-seccertificate-ct.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E031D8085FC00865A7C /* si-82-seccertificate-ct.c */; };

                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */; };
                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */; };

-               DC52EE5B1D80D73800B0A59C /* si-97-sectrust-path-scoring.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E101D8085FC00865A7C /* si-97-sectrust-path-scoring.m */; };
-               DC52EE5C1D80D76300B0A59C /* si-20-sectrust-policies.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DBA1D8085FC00865A7C /* si-20-sectrust-policies.m */; };
-               DC52EE5D1D80D76B00B0A59C /* si-87-sectrust-name-constraints.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E091D8085FC00865A7C /* si-87-sectrust-name-constraints.m */; };
-               DC52EE5E1D80D78C00B0A59C /* si-82-sectrust-ct.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E041D8085FC00865A7C /* si-82-sectrust-ct.m */; };
-               DC52EE5F1D80D79400B0A59C /* si-85-sectrust-ssl-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E071D8085FC00865A7C /* si-85-sectrust-ssl-policy.c */; };
-               DC52EE601D80D79900B0A59C /* si-74-OTAPKISigner.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFE1D8085FC00865A7C /* si-74-OTAPKISigner.c */; };

                DC52EE611D80D79E00B0A59C /* si-71-mobile-store-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */; };
                DC52EE6F1D80D83F00B0A59C /* SecPasswordGenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7A1D8085FC00865A7C /* SecPasswordGenerate.c */; };
                DC52EE701D80D84700B0A59C /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */; };
                DC52EE711D80D85F00B0A59C /* SecECKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E491D8085FC00865A7C /* SecECKey.m */; };
                DC52EE721D80D86400B0A59C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DC52EE611D80D79E00B0A59C /* si-71-mobile-store-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */; };
                DC52EE6F1D80D83F00B0A59C /* SecPasswordGenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7A1D8085FC00865A7C /* SecPasswordGenerate.c */; };
                DC52EE701D80D84700B0A59C /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */; };
                DC52EE711D80D85F00B0A59C /* SecECKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E491D8085FC00865A7C /* SecECKey.m */; };
                DC52EE721D80D86400B0A59C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };

-               DC52EE731D80D86800B0A59C /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.c */; };
+               DC52EE731D80D86800B0A59C /* SecKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.m */; };

                DC52EE741D80D86F00B0A59C /* SecAccessControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E301D8085FC00865A7C /* SecAccessControl.m */; };
                DC52EE761D80D87F00B0A59C /* SecCTKKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E441D8085FC00865A7C /* SecCTKKey.m */; };
                DC52EE771D80D88300B0A59C /* SecDH.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E461D8085FC00865A7C /* SecDH.c */; };
                DC52EE741D80D86F00B0A59C /* SecAccessControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E301D8085FC00865A7C /* SecAccessControl.m */; };
                DC52EE761D80D87F00B0A59C /* SecCTKKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E441D8085FC00865A7C /* SecCTKKey.m */; };
                DC52EE771D80D88300B0A59C /* SecDH.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E461D8085FC00865A7C /* SecDH.c */; };


@@ -3176,12 +3875,31 @@
                DC52EE7B1D80D89900B0A59C /* SecKeyAdaptors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */; };
                DC52EE7C1D80D89E00B0A59C /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */; };
                DC54DD0F1EA7D9E700108E92 /* CKKSManifestLeafRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 476D873A1E6750E200190352 /* CKKSManifestLeafRecord.m */; };
                DC52EE7B1D80D89900B0A59C /* SecKeyAdaptors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */; };
                DC52EE7C1D80D89E00B0A59C /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */; };
                DC54DD0F1EA7D9E700108E92 /* CKKSManifestLeafRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 476D873A1E6750E200190352 /* CKKSManifestLeafRecord.m */; };

-               DC54DD101EA7D9E800108E92 /* CKKSManifestLeafRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 476D873A1E6750E200190352 /* CKKSManifestLeafRecord.m */; };

                DC55329B1DDAA28600B6A6A7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };
                DC55329B1DDAA28600B6A6A7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };

+               DC5681AA224DA05F008F8DEB /* OctagonFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5681A8224DA05F008F8DEB /* OctagonFlags.h */; };
+               DC5681AB224DA05F008F8DEB /* OctagonFlags.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5681A9224DA05F008F8DEB /* OctagonFlags.m */; };

                DC58C4331D77BE2E003C25A4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC58C43E1D77BED0003C25A4 /* csparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC58C43B1D77BED0003C25A4 /* csparser.cpp */; };
                DC58C4331D77BE2E003C25A4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                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 */; };
+               DC59244A20E46E9D0073D284 /* SOSRingUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D461D8085F200865A7C /* SOSRingUtils.c */; };
+               DC59244B20E46EA20073D284 /* SOSRingTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D451D8085F200865A7C /* SOSRingTypes.h */; };
+               DC59244C20E46EDD0073D284 /* SOSRingTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D441D8085F200865A7C /* SOSRingTypes.m */; };
+               DC59244D20E46F0E0073D284 /* SOSTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D741D8085F200865A7C /* SOSTransport.m */; };
+               DC59244E20E46F200073D284 /* SOSTransport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D751D8085F200865A7C /* SOSTransport.h */; };
+               DC59244F20E46F470073D284 /* SOSAccountRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C801DA5BC0E00CC09B9 /* SOSAccountRecovery.m */; };
+               DC59245020E46F800073D284 /* SOSRecoveryKeyBag.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C731DA5BB4200CC09B9 /* SOSRecoveryKeyBag.m */; };
+               DC59245120E46F840073D284 /* SOSRecoveryKeyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 48776C741DA5BB4200CC09B9 /* SOSRecoveryKeyBag.h */; };
+               DC59245220E46FAA0073D284 /* SOSRingBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3A1D8085F200865A7C /* SOSRingBackup.m */; };
+               DC59245320E46FB10073D284 /* SOSRingBackup.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3B1D8085F200865A7C /* SOSRingBackup.h */; };
+               DC59245420E46FDE0073D284 /* SOSRingBasic.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3C1D8085F200865A7C /* SOSRingBasic.m */; };
+               DC59245520E470070073D284 /* SOSRingRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C7C1DA5BB5F00CC09B9 /* SOSRingRecovery.m */; };
+               DC59245620E470350073D284 /* SOSRingConcordanceTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3E1D8085F200865A7C /* SOSRingConcordanceTrust.c */; };
+               DC59245720E470390073D284 /* SOSRingConcordanceTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3F1D8085F200865A7C /* SOSRingConcordanceTrust.h */; };
+               DC59245820E4711F0073D284 /* SOSRingDER.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D401D8085F200865A7C /* SOSRingDER.c */; };
+               DC5999752232FA3700A9F1A3 /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
+               DC5A01E821BB428500D87AB9 /* CKKSTLKShare.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5A01E621BB428500D87AB9 /* CKKSTLKShare.h */; };
+               DC5A01E921BB428500D87AB9 /* CKKSTLKShare.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5A01E621BB428500D87AB9 /* CKKSTLKShare.h */; };
+               DC5A01EA21BB428500D87AB9 /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */; };
+               DC5A01EB21BB428500D87AB9 /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */; };

                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 */; };
                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 */; };


@@ -3254,15 +3972,13 @@
                DC5ABE181D832F2200CF422C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC5ABE191D832F2700CF422C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC5ABE1A1D832F3E00CF422C /* security.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC5ABDBF1D832D5D00CF422C /* security.1 */; };
                DC5ABE181D832F2200CF422C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC5ABE191D832F2700CF422C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC5ABE1A1D832F3E00CF422C /* security.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC5ABDBF1D832D5D00CF422C /* security.1 */; };

-               DC5AC0C01D83538000CF422C /* securityd.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC5ABFE01D83513400CF422C /* securityd.1 */; };
+               DC5AC0C01D83538000CF422C /* securityd.1 in Man pages */ = {isa = PBXBuildFile; fileRef = DC5ABFE01D83513400CF422C /* securityd.1 */; };

                DC5AC0C11D83538800CF422C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789261D7799D300B50D50 /* IOKit.framework */; };
                DC5AC0C21D83538D00CF422C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC5AC0C41D8353BB00CF422C /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0C31D8353B900CF422C /* System.framework */; };
                DC5AC0C51D8353C200CF422C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC5AC0C11D83538800CF422C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789261D7799D300B50D50 /* IOKit.framework */; };
                DC5AC0C21D83538D00CF422C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC5AC0C41D8353BB00CF422C /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0C31D8353B900CF422C /* System.framework */; };
                DC5AC0C51D8353C200CF422C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };

-               DC5AC0C71D8353C800CF422C /* PCSC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0C61D8353C800CF422C /* PCSC.framework */; };

                DC5AC0C91D8353D100CF422C /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789181D77998C00B50D50 /* libbsm.dylib */; };
                DC5AC0CE1D83542B00CF422C /* libsecurity_tokend_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0CD1D83542700CF422C /* libsecurity_tokend_client.a */; };
                DC5AC0C91D8353D100CF422C /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789181D77998C00B50D50 /* libbsm.dylib */; };
                DC5AC0CE1D83542B00CF422C /* libsecurity_tokend_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0CD1D83542700CF422C /* libsecurity_tokend_client.a */; };

-               DC5AC0D21D83544800CF422C /* libauto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789161D77998700B50D50 /* libauto.dylib */; };

                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };
                DC5AC0D41D83547A00CF422C /* libsecuritydservice_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0B91D83533400CF422C /* libsecuritydservice_client.a */; };
                DC5AC0D61D83548300CF422C /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */; };
                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };
                DC5AC0D41D83547A00CF422C /* libsecuritydservice_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC5AC0B91D83533400CF422C /* libsecuritydservice_client.a */; };
                DC5AC0D61D83548300CF422C /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */; };


@@ -3283,7 +3999,6 @@
                DC5AC0E61D8354CA00CF422C /* tokendatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9B1D83511A00CF422C /* tokendatabase.cpp */; };
                DC5AC0E71D8354CA00CF422C /* tokenkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9D1D83511A00CF422C /* tokenkey.cpp */; };
                DC5AC0E81D8354CA00CF422C /* tokenaccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9F1D83511A00CF422C /* tokenaccess.cpp */; };
                DC5AC0E61D8354CA00CF422C /* tokendatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9B1D83511A00CF422C /* tokendatabase.cpp */; };
                DC5AC0E71D8354CA00CF422C /* tokenkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9D1D83511A00CF422C /* tokenkey.cpp */; };
                DC5AC0E81D8354CA00CF422C /* tokenaccess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABF9F1D83511A00CF422C /* tokenaccess.cpp */; };

-               DC5AC0E91D8354CA00CF422C /* pcscmonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA31D83511A00CF422C /* pcscmonitor.cpp */; };

                DC5AC0EA1D8354CA00CF422C /* reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA51D83511A00CF422C /* reader.cpp */; };
                DC5AC0EB1D8354CA00CF422C /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA71D83511A00CF422C /* token.cpp */; };
                DC5AC0EC1D8354CA00CF422C /* tokend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA91D83511A00CF422C /* tokend.cpp */; };
                DC5AC0EA1D8354CA00CF422C /* reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA51D83511A00CF422C /* reader.cpp */; };
                DC5AC0EB1D8354CA00CF422C /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA71D83511A00CF422C /* token.cpp */; };
                DC5AC0EC1D8354CA00CF422C /* tokend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFA91D83511A00CF422C /* tokend.cpp */; };


@@ -3297,7 +4012,6 @@
                DC5AC0F41D8354CA00CF422C /* credential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFBB1D83511A00CF422C /* credential.cpp */; };
                DC5AC0F51D8354CA00CF422C /* clientid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFBE1D83511A00CF422C /* clientid.cpp */; };
                DC5AC0F61D8354CA00CF422C /* codesigdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC01D83511A00CF422C /* codesigdb.cpp */; };
                DC5AC0F41D8354CA00CF422C /* credential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFBB1D83511A00CF422C /* credential.cpp */; };
                DC5AC0F51D8354CA00CF422C /* clientid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFBE1D83511A00CF422C /* clientid.cpp */; };
                DC5AC0F61D8354CA00CF422C /* codesigdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC01D83511A00CF422C /* codesigdb.cpp */; };

-               DC5AC0F71D8354CA00CF422C /* csproxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC31D83511A00CF422C /* csproxy.cpp */; };

                DC5AC0F81D8354CA00CF422C /* agentquery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC71D83511A00CF422C /* agentquery.cpp */; };
                DC5AC0F91D8354CA00CF422C /* auditevents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC91D83511A00CF422C /* auditevents.cpp */; };
                DC5AC0FA1D8354CA00CF422C /* ccaudit_extensions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFCB1D83511A00CF422C /* ccaudit_extensions.cpp */; };
                DC5AC0F81D8354CA00CF422C /* agentquery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC71D83511A00CF422C /* agentquery.cpp */; };
                DC5AC0F91D8354CA00CF422C /* auditevents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFC91D83511A00CF422C /* auditevents.cpp */; };
                DC5AC0FA1D8354CA00CF422C /* ccaudit_extensions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC5ABFCB1D83511A00CF422C /* ccaudit_extensions.cpp */; };


@@ -3335,7 +4049,6 @@
                DC5AC11F1D83555A00CF422C /* credential.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBA1D83511A00CF422C /* credential.h */; };
                DC5AC1201D83555A00CF422C /* clientid.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBD1D83511A00CF422C /* clientid.h */; };
                DC5AC1211D83555A00CF422C /* codesigdb.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBF1D83511A00CF422C /* codesigdb.h */; };
                DC5AC11F1D83555A00CF422C /* credential.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBA1D83511A00CF422C /* credential.h */; };
                DC5AC1201D83555A00CF422C /* clientid.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBD1D83511A00CF422C /* clientid.h */; };
                DC5AC1211D83555A00CF422C /* codesigdb.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFBF1D83511A00CF422C /* codesigdb.h */; };

-               DC5AC1221D83555A00CF422C /* csproxy.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC21D83511A00CF422C /* csproxy.h */; };

                DC5AC1231D83555A00CF422C /* agentclient.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC51D83511A00CF422C /* agentclient.h */; };
                DC5AC1241D83555A00CF422C /* agentquery.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC61D83511A00CF422C /* agentquery.h */; };
                DC5AC1251D83555A00CF422C /* auditevents.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC81D83511A00CF422C /* auditevents.h */; };
                DC5AC1231D83555A00CF422C /* agentclient.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC51D83511A00CF422C /* agentclient.h */; };
                DC5AC1241D83555A00CF422C /* agentquery.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC61D83511A00CF422C /* agentquery.h */; };
                DC5AC1251D83555A00CF422C /* auditevents.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5ABFC81D83511A00CF422C /* auditevents.h */; };


@@ -3348,17 +4061,14 @@
                DC5B391720C08B38005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DC5B391820C08B39005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DC5B391A20C08B70005B09F6 /* SecBase.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC5860220BF8A98005C7269 /* SecBase.c */; };
                DC5B391720C08B38005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DC5B391820C08B39005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DC5B391A20C08B70005B09F6 /* SecBase.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC5860220BF8A98005C7269 /* SecBase.c */; };

-               DC5B391B20C08BDC005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
-               DC5B391C20C08BF1005B09F6 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };

                DC5BB4FA1E0C90DE0010F836 /* CKKSIncomingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */; };
                DC5BB4FA1E0C90DE0010F836 /* CKKSIncomingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */; };

-               DC5BB4FB1E0C90DF0010F836 /* CKKSIncomingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */; };

                DC5BB4FE1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5BB4FC1E0C98320010F836 /* CKKSOutgoingQueueOperation.h */; };
                DC5BB4FE1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5BB4FC1E0C98320010F836 /* CKKSOutgoingQueueOperation.h */; };

-               DC5BB4FF1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5BB4FC1E0C98320010F836 /* CKKSOutgoingQueueOperation.h */; };

                DC5BB5001E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */; };
                DC5BB5001E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */; };

-               DC5BB5011E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */; };

                DC5BCC481E53820200649140 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
                DC5BD5831E8C6FC800C5EC49 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC5BD5841E8C6FD100C5EC49 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC5BCC481E53820200649140 /* SecArgParse.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5BCC461E5380EA00649140 /* SecArgParse.c */; };
                DC5BD5831E8C6FC800C5EC49 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC5BD5841E8C6FD100C5EC49 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };

+               DC5BEACD2217509A001681F0 /* OctagonTests+CloudKitAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5BEACC2217509A001681F0 /* OctagonTests+CloudKitAccount.swift */; };
+               DC5F2BBE2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC5F2BBD2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift */; };

                DC5F35A61EE0F25000900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35A71EE0F25100900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35A81EE0F25300900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35A61EE0F25000900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35A71EE0F25100900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35A81EE0F25300900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };


@@ -3369,8 +4079,12 @@
                DC5F35AE1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35AF1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35B01EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35AE1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35AF1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
                DC5F35B01EE0F27C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };

-               DC5F35B11EE0F28B00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
-               DC5F35B21EE0F28C00900966 /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               DC5F65AE2225C22C0051E9FA /* CKKSProvideKeySetOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC5F65AC2225C22C0051E9FA /* CKKSProvideKeySetOperation.h */; };
+               DC5F65AF2225C22C0051E9FA /* CKKSProvideKeySetOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5F65AD2225C22C0051E9FA /* CKKSProvideKeySetOperation.m */; };
+               DC5F65B12225CD720051E9FA /* CKKSProvideKeySetOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5F65AD2225C22C0051E9FA /* CKKSProvideKeySetOperation.m */; };
+               DC60132E2147220600863C1A /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               DC6013392147227800863C1A /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               DC6063B221B09AB200069B82 /* KCJoiningRequestCircleSession.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6063B121B09AB200069B82 /* KCJoiningRequestCircleSession.m */; };

                DC610A181D78F129002223DE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB31175685B000BC1A7E /* main.m */; };
                DC610A1D1D78F129002223DE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DC610A1E1D78F129002223DE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                DC610A181D78F129002223DE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB31175685B000BC1A7E /* main.m */; };
                DC610A1D1D78F129002223DE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DC610A1E1D78F129002223DE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };


@@ -3381,7 +4095,6 @@
                DC610A2C1D78F129002223DE /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                DC610A2E1D78F129002223DE /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                DC610A2F1D78F129002223DE /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */; };
                DC610A2C1D78F129002223DE /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                DC610A2E1D78F129002223DE /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                DC610A2F1D78F129002223DE /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */; };

-               DC610A391D78F1B7002223DE /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB2CA4D81D2C28C800AB770F /* libaks.a */; };

                DC610A3B1D78F234002223DE /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                DC610A3D1D78F25C002223DE /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };
                DC610A501D78F715002223DE /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DC610A4F1D78F715002223DE /* main.c */; };
                DC610A3B1D78F234002223DE /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                DC610A3D1D78F25C002223DE /* libDiagnosticMessagesClient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */; };
                DC610A501D78F715002223DE /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DC610A4F1D78F715002223DE /* main.c */; };


@@ -3394,7 +4107,9 @@
                DC610A6A1D78FA8C002223DE /* validation.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC610A681D78FA87002223DE /* validation.sh */; };
                DC610AB11D7910C3002223DE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC610ABA1D7910F8002223DE /* gk_reset_check.c in Sources */ = {isa = PBXBuildFile; fileRef = DC610AB91D7910F8002223DE /* gk_reset_check.c */; };
                DC610A6A1D78FA8C002223DE /* validation.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC610A681D78FA87002223DE /* validation.sh */; };
                DC610AB11D7910C3002223DE /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DC610ABA1D7910F8002223DE /* gk_reset_check.c in Sources */ = {isa = PBXBuildFile; fileRef = DC610AB91D7910F8002223DE /* gk_reset_check.c */; };

-               DC63CAF81D91A15F00C03317 /* libsecurity_cms_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1002CB1D8E19D70025549C /* libsecurity_cms_regressions.a */; };
+               DC614C5122A9BDB500E16ADA /* CKKSZoneModifier.h in Headers */ = {isa = PBXBuildFile; fileRef = DC614C4F22A9BDB500E16ADA /* CKKSZoneModifier.h */; };
+               DC614C5222A9BDB500E16ADA /* CKKSZoneModifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DC614C5022A9BDB500E16ADA /* CKKSZoneModifier.m */; };
+               DC62DC6D22A87137000D2D5D /* CKKSTests+MultiZone.m in Sources */ = {isa = PBXBuildFile; fileRef = DC62DC6B22A87128000D2D5D /* CKKSTests+MultiZone.m */; };

                DC63D70820B3931100D088AD /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DC63D70220B3930700D088AD /* libxar.tbd */; };
                DC6593D11ED8DAB900C19462 /* CKKSTests+CurrentPointerAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */; };
                DC65E7231D8CB28900152EF0 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DC63D70820B3931100D088AD /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DC63D70220B3930700D088AD /* libxar.tbd */; };
                DC6593D11ED8DAB900C19462 /* CKKSTests+CurrentPointerAPI.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */; };
                DC65E7231D8CB28900152EF0 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };


@@ -3413,12 +4128,9 @@
                DC65E77B1D8CB8E800152EF0 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC65E77C1D8CB8F100152EF0 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC65E7BD1D8CBA6C00152EF0 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC65E77B1D8CB8E800152EF0 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC65E77C1D8CB8F100152EF0 /* MobileKeyBag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DC65E7BD1D8CBA6C00152EF0 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };

-               DC65E7C01D8CBB1500152EF0 /* readline.c in Sources */ = {isa = PBXBuildFile; fileRef = DC65E7BE1D8CBB1500152EF0 /* readline.c */; };
-               DC65E7C11D8CBB1500152EF0 /* readline.h in Headers */ = {isa = PBXBuildFile; fileRef = DC65E7BF1D8CBB1500152EF0 /* readline.h */; };

                DC65E7C21D8CBB5800152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DC65E7C31D8CBBA200152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DC65E7C41D8CBC0900152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DC65E7C21D8CBB5800152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DC65E7C31D8CBBA200152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DC65E7C41D8CBC0900152EF0 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };

-               DC6A82A01D87761700418608 /* cshosting.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A82841D87734600418608 /* cshosting.h */; settings = {ATTRIBUTES = (Public, ); }; };

                DC6A82A11D87761F00418608 /* ucspNotify.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A827E1D87734600418608 /* ucspNotify.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC6A82A21D87762400418608 /* ucsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A827D1D87734600418608 /* ucsp.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC6A82A31D87762900418608 /* ucsp_types.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A82741D87732E00418608 /* ucsp_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC6A82A11D87761F00418608 /* ucspNotify.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A827E1D87734600418608 /* ucspNotify.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC6A82A21D87762400418608 /* ucsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A827D1D87734600418608 /* ucsp.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DC6A82A31D87762900418608 /* ucsp_types.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6A82741D87732E00418608 /* ucsp_types.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -3451,89 +4163,85 @@
                DC6A82BE1D87769800418608 /* transition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82711D87732E00418608 /* transition.cpp */; };
                DC6A82BF1D8776B300418608 /* ucspClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A827F1D87734600418608 /* ucspClient.cpp */; };
                DC6A82C01D8776B300418608 /* ucspNotifySender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82821D87734600418608 /* ucspNotifySender.cpp */; };
                DC6A82BE1D87769800418608 /* transition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82711D87732E00418608 /* transition.cpp */; };
                DC6A82BF1D8776B300418608 /* ucspClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A827F1D87734600418608 /* ucspClient.cpp */; };
                DC6A82C01D8776B300418608 /* ucspNotifySender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82821D87734600418608 /* ucspNotifySender.cpp */; };

-               DC6A82C11D8776B900418608 /* cshostingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82851D87734600418608 /* cshostingClient.cpp */; };
-               DC6A82C21D8776B900418608 /* cshostingServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82861D87734600418608 /* cshostingServer.cpp */; };

                DC6A82C41D8776D800418608 /* ssblob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82571D87732E00418608 /* ssblob.cpp */; };
                DC6ACC461E81E08D00125DC5 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC6ACC471E81E08E00125DC5 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC6BC2721D90D05900DD57B3 /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC5ABFE41D83514700CF422C /* com.apple.securityd.plist */; };
                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */; };
                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */; };
                DC6A82C41D8776D800418608 /* ssblob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC6A82571D87732E00418608 /* ssblob.cpp */; };
                DC6ACC461E81E08D00125DC5 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC6ACC471E81E08E00125DC5 /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
                DC6BC2721D90D05900DD57B3 /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC5ABFE41D83514700CF422C /* com.apple.securityd.plist */; };
                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9B7AE41DCBF604004E9385 /* CKKSOutgoingQueueEntry.m */; };
                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */; };

-               DC7162D21EB413F2000D2BB5 /* KeychainCKKS.plist in Copy BATS Test Discovery plist */ = {isa = PBXBuildFile; fileRef = 6CB5F4781E402E5700DBF3F0 /* KeychainCKKS.plist */; };
+               DC6DE899213076C000C6B56D /* OTSOSUpgradeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6DE897213076C000C6B56D /* OTSOSUpgradeOperation.h */; };
+               DC6DE89C213076C000C6B56D /* OTSOSUpgradeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6DE898213076C000C6B56D /* OTSOSUpgradeOperation.m */; };
+               DC6E02162405DE3900C61335 /* OTModifyUserControllableViewStatusOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6E02132405DDC400C61335 /* OTModifyUserControllableViewStatusOperation.m */; };

                DC71D85C1D94CCD40065FB93 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DC71D85C1D94CCD40065FB93 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };

-               DC71D8F51D959F150065FB93 /* com.apple.securityd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */; };
-               DC71D9A11D95BA6C0065FB93 /* SecAsn1Coder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785131D77895A00B50D50 /* SecAsn1Coder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A21D95BA6C0065FB93 /* SecAsn1Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785141D77895A00B50D50 /* SecAsn1Templates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A31D95BA6C0065FB93 /* SecAsn1Types.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785151D77895A00B50D50 /* SecAsn1Types.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A41D95BA6C0065FB93 /* SecNssCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834421D8A21AA00CE0ACA /* SecNssCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A51D95BA6C0065FB93 /* X509Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787691D77911D00B50D50 /* X509Templates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A61D95BA6C0065FB93 /* oidsbase.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785681D778B4A00B50D50 /* oidsbase.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A71D95BA6C0065FB93 /* certExtensionTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787621D77911D00B50D50 /* certExtensionTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A81D95BA6C0065FB93 /* csrTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787631D77911D00B50D50 /* csrTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9A91D95BA6C0065FB93 /* keyTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787641D77911D00B50D50 /* keyTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AA1D95BA6C0065FB93 /* nameTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787651D77911D00B50D50 /* nameTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AB1D95BA6C0065FB93 /* nssUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834201D8A21AA00CE0ACA /* nssUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AC1D95BA6C0065FB93 /* ocspTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787661D77911D00B50D50 /* ocspTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AD1D95BA6C0065FB93 /* oidsalg.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785111D77895A00B50D50 /* oidsalg.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AE1D95BA6C0065FB93 /* oidsattr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1785121D77895A00B50D50 /* oidsattr.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9AF1D95BA6C0065FB93 /* oidsocsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88344F1D8A21AA00CE0ACA /* oidsocsp.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B01D95BA6C0065FB93 /* osKeyTemplates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787671D77911D00B50D50 /* osKeyTemplates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B11D95BA6C0065FB93 /* pkcs12Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88341A1D8A21AA00CE0ACA /* pkcs12Templates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B21D95BA6C0065FB93 /* pkcs7Templates.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834181D8A21AA00CE0ACA /* pkcs7Templates.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B31D95BA6C0065FB93 /* plarena.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834241D8A21AA00CE0ACA /* plarena.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B41D95BA6C0065FB93 /* plarenas.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834251D8A21AA00CE0ACA /* plarenas.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B51D95BA6C0065FB93 /* plstr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834261D8A21AA00CE0ACA /* plstr.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B61D95BA6C0065FB93 /* prbit.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834271D8A21AA00CE0ACA /* prbit.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B71D95BA6C0065FB93 /* prcpucfg.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834281D8A21AA00CE0ACA /* prcpucfg.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B81D95BA6C0065FB93 /* prerr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88342B1D8A21AA00CE0ACA /* prerr.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9B91D95BA6C0065FB93 /* prerror.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88342C1D8A21AA00CE0ACA /* prerror.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BA1D95BA6C0065FB93 /* prlog.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834301D8A21AA00CE0ACA /* prlog.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BB1D95BA6C0065FB93 /* prmem.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834321D8A21AA00CE0ACA /* prmem.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BC1D95BA6C0065FB93 /* protypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834341D8A21AA00CE0ACA /* protypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BD1D95BA6C0065FB93 /* prtypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834371D8A21AA00CE0ACA /* prtypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BE1D95BA6C0065FB93 /* secasn1.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834391D8A21AA00CE0ACA /* secasn1.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9BF1D95BA6C0065FB93 /* secasn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DC1787681D77911D00B50D50 /* secasn1t.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9C01D95BA6C0065FB93 /* seccomon.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88343E1D8A21AA00CE0ACA /* seccomon.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9C11D95BA6C0065FB93 /* secerr.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88343F1D8A21AA00CE0ACA /* secerr.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9C21D95BA6C0065FB93 /* secport.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8834441D8A21AA00CE0ACA /* secport.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DC71D9C41D95BA6C0065FB93 /* X509Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834451D8A21AA00CE0ACA /* X509Templates.c */; };
-               DC71D9C51D95BA6C0065FB93 /* keyTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834131D8A21AA00CE0ACA /* keyTemplates.c */; };
-               DC71D9C61D95BA6C0065FB93 /* SecAsn1Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */; };
-               DC71D9C71D95BA6C0065FB93 /* osKeyTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834471D8A21AA00CE0ACA /* osKeyTemplates.c */; };
-               DC71D9C81D95BA6C0065FB93 /* nsprPortX.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88341B1D8A21AA00CE0ACA /* nsprPortX.c */; };
-               DC71D9C91D95BA6C0065FB93 /* nameTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834151D8A21AA00CE0ACA /* nameTemplates.c */; };
-               DC71D9CA1D95BA6C0065FB93 /* pkcs7Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834171D8A21AA00CE0ACA /* pkcs7Templates.c */; };
-               DC71D9CB1D95BA6C0065FB93 /* plarena.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834231D8A21AA00CE0ACA /* plarena.c */; };
-               DC71D9CC1D95BA6C0065FB93 /* secasn1e.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88343B1D8A21AA00CE0ACA /* secasn1e.c */; };
-               DC71D9CD1D95BA6C0065FB93 /* SecNssCoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC8834411D8A21AA00CE0ACA /* SecNssCoder.cpp */; };
-               DC71D9CE1D95BA6C0065FB93 /* oidsalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834491D8A21AA00CE0ACA /* oidsalg.c */; };
-               DC71D9CF1D95BA6C0065FB93 /* ocspTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834211D8A21AA00CE0ACA /* ocspTemplates.c */; };
-               DC71D9D01D95BA6C0065FB93 /* certExtensionTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */; };
-               DC71D9D11D95BA6C0065FB93 /* secport.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834431D8A21AA00CE0ACA /* secport.c */; };
-               DC71D9D21D95BA6C0065FB93 /* nssUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88341F1D8A21AA00CE0ACA /* nssUtils.c */; };
-               DC71D9D31D95BA6C0065FB93 /* pkcs12Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834191D8A21AA00CE0ACA /* pkcs12Templates.c */; };
-               DC71D9D41D95BA6C0065FB93 /* csrTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834111D8A21AA00CE0ACA /* csrTemplates.c */; };
-               DC71D9D51D95BA6C0065FB93 /* oidsattr.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88344B1D8A21AA00CE0ACA /* oidsattr.c */; };
-               DC71D9D61D95BA6C0065FB93 /* secErrorStr.c in Sources */ = {isa = PBXBuildFile; fileRef = DC8834401D8A21AA00CE0ACA /* secErrorStr.c */; };
-               DC71D9D71D95BA6C0065FB93 /* oidsocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88344E1D8A21AA00CE0ACA /* oidsocsp.c */; };
-               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 */; };
-               DC72BCD720B3A7DF00B26495 /* libOpenScriptingUtil.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DC63D70920B3933000D088AD /* libOpenScriptingUtil.tbd */; settings = {ATTRIBUTES = (Weak, ); }; };
-               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 */; };
+               DC71D8F51D959F150065FB93 /* com.apple.securityd.plist in Copy Logging Files */ = {isa = PBXBuildFile; fileRef = DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */; };
+               DC725030229600C000493D88 /* OctagonTests+Reset.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC72502D229600A800493D88 /* OctagonTests+Reset.swift */; };
+               DC7250372296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7250352296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h */; };
+               DC7250382296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7250362296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m */; };
+               DC730E1222400D790051DD48 /* TPDictionaryMatchingRules.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8846802237431400738068 /* TPDictionaryMatchingRules.m */; };
+               DC730E1322400D7B0051DD48 /* TPDictionaryMatchingRules.h in Headers */ = {isa = PBXBuildFile; fileRef = DC88467F2237431400738068 /* TPDictionaryMatchingRules.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC730E142240103A0051DD48 /* TPDictionaryMatchingRuleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC88466C2237407500738068 /* TPDictionaryMatchingRuleTests.m */; };
+               DC730E1B224011E20051DD48 /* TPPBDictionaryMatchingRule.m in Sources */ = {isa = PBXBuildFile; fileRef = DC730E15224011D60051DD48 /* TPPBDictionaryMatchingRule.m */; };
+               DC730E1C224011E40051DD48 /* TPPBDictionaryMatchingRuleFieldExists.m in Sources */ = {isa = PBXBuildFile; fileRef = DC730E17224011D80051DD48 /* TPPBDictionaryMatchingRuleFieldExists.m */; };
+               DC730E1D224011E70051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.m in Sources */ = {isa = PBXBuildFile; fileRef = DC730E19224011DB0051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.m */; };
+               DC730E1F224012710051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.h in Headers */ = {isa = PBXBuildFile; fileRef = DC730E18224011D90051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC730E20224012770051DD48 /* TPPBDictionaryMatchingRuleFieldExists.h in Headers */ = {isa = PBXBuildFile; fileRef = DC730E1A224011DD0051DD48 /* TPPBDictionaryMatchingRuleFieldExists.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC730E212240127D0051DD48 /* TPPBDictionaryMatchingRule.h in Headers */ = {isa = PBXBuildFile; fileRef = DC730E16224011D70051DD48 /* TPPBDictionaryMatchingRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DC730E2522401E310051DD48 /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               DC730E2922401F5E0051DD48 /* ProtocolBuffer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0B0C441E2537CC007F95E5 /* ProtocolBuffer.framework */; };
+               DC7341F31F8447AB00AB9BDF /* CKKSTLKShareRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7341F11F8447AB00AB9BDF /* CKKSTLKShareRecord.h */; };
+               DC7341F51F8447AB00AB9BDF /* CKKSTLKShareRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341F21F8447AB00AB9BDF /* CKKSTLKShareRecord.m */; };

                DC7341FE1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */; };
                DC7341FE1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */; };

+               DC747993222720C8001E0E8C /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
+               DC7479982227229D001E0E8C /* CKKSTLKShare.m in Sources */ = {isa = PBXBuildFile; fileRef = DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */; };
+               DC747999222722B2001E0E8C /* CKKSConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = DC391F9921BF2F4B00772585 /* CKKSConstants.m */; };
+               DC74799A222722BC001E0E8C /* CKKSKeychainBackedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */; };
+               DC74799C22272331001E0E8C /* CKKSPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */; };
+               DC74799D22272344001E0E8C /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
+               DC74799E22272358001E0E8C /* CKKSSerializedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */; };
+               DC752F1721C1B48400216089 /* SOSPiggyback.m in Sources */ = {isa = PBXBuildFile; fileRef = EB75B4941E75A44100E469CC /* SOSPiggyback.m */; };
+               DC752F1921C1B69C00216089 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
+               DC752F1A21C1B6A700216089 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
+               DC752F1F21C1B98000216089 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
+               DC754C722228B57C00A39C8E /* TrustedPeersHelperProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DC754C712228B57B00A39C8E /* TrustedPeersHelperProtocol.m */; };
+               DC754C742228B59000A39C8E /* TrustedPeersHelperProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DC754C712228B57B00A39C8E /* TrustedPeersHelperProtocol.m */; };

                DC762A9E1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */ = {isa = PBXBuildFile; fileRef = DC762A9C1E57A86A00B03A2C /* CKKSRecordHolder.h */; };
                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 */; };
                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = DC762A9D1E57A86A00B03A2C /* CKKSRecordHolder.m */; };

-               DC762AA11E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = DC762A9D1E57A86A00B03A2C /* CKKSRecordHolder.m */; };

                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */; };
                DC7A17ED1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */; };
                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */; };
                DC7A17ED1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */; };

-               DC7A17EE1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */; };

                DC7A17EF1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */; };
                DC7A17EF1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */; };

-               DC7A17F01E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */; };
+               DC7F6A7D233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC7F6A7C233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift */; };
+               DC7F79B622EA4ED4001FB69A /* OctagonTests+CKKS.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC7F79B522EA4ED4001FB69A /* OctagonTests+CKKS.swift */; };
+               DC7F79BA22EA5C73001FB69A /* OTLocalCKKSResetOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7F79B822EA5C72001FB69A /* OTLocalCKKSResetOperation.h */; };
+               DC7F79BB22EA5C73001FB69A /* OTLocalCKKSResetOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7F79B922EA5C72001FB69A /* OTLocalCKKSResetOperation.m */; };
+               DC7FC45021EE917D003C39B8 /* Security.plist in Install Security FeatureFlags plist */ = {isa = PBXBuildFile; fileRef = DC7FC44321EE6F7B003C39B8 /* Security.plist */; };
+               DC85069B2097E69500C712EC /* keychain_backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E211D8085FC00865A7C /* keychain_backup.c */; };
+               DC85069D2097E69500C712EC /* keychain_backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E211D8085FC00865A7C /* keychain_backup.c */; };
+               DC8506A62097EE7300C712EC /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA981D80CC2A00B0A59C /* SecurityTool.c */; };
+               DC8506A72097EE7500C712EC /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA981D80CC2A00B0A59C /* SecurityTool.c */; };
+               DC8506A82097EE8E00C712EC /* KeychainCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337831FDB29A200E19F30 /* KeychainCheck.m */; };
+               DC8506A92097EE8F00C712EC /* KeychainCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337831FDB29A200E19F30 /* KeychainCheck.m */; };
+               DC8506AA2097EEA500C712EC /* syncbubble.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA921D80CC2A00B0A59C /* syncbubble.m */; };
+               DC8506AB2097EEA600C712EC /* syncbubble.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA921D80CC2A00B0A59C /* syncbubble.m */; };
+               DC8506AC2097EEBA00C712EC /* sos.m in Sources */ = {isa = PBXBuildFile; fileRef = EB48C19E1E573EDC00EC5E57 /* sos.m */; };
+               DC8506AD2097EEBC00C712EC /* sos.m in Sources */ = {isa = PBXBuildFile; fileRef = EB48C19E1E573EDC00EC5E57 /* sos.m */; };
+               DC8506AE2097EEDA00C712EC /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA931D80CC2A00B0A59C /* leaks.c */; };
+               DC8506AF2097EEDB00C712EC /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA931D80CC2A00B0A59C /* leaks.c */; };
+               DC8506B02097EEF200C712EC /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
+               DC8506B12097EEF300C712EC /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
+               DC8506B22097F1DF00C712EC /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */; };
+               DC8506B32097F1E000C712EC /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */; };
+               DC8506B42097F1FC00C712EC /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA911D80CC2A00B0A59C /* whoami.m */; };
+               DC8506B52097F1FD00C712EC /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA911D80CC2A00B0A59C /* whoami.m */; };
+               DC8506B62097F39100C712EC /* libSOSCommands.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC341D80CFB200B0A59C /* libSOSCommands.a */; };
+               DC85687E2284E7860088D3EF /* OctagonTestMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC85687C2284E7850088D3EF /* OctagonTestMocks.swift */; };
+               DC86122C2408AC190092E93B /* CKKSTests+ItemSyncChoice.m in Sources */ = {isa = PBXBuildFile; fileRef = DC86122B2408AC190092E93B /* CKKSTests+ItemSyncChoice.m */; };
+               DC8757F4218D2003000E65F1 /* OTRemovePeersOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC8757F2218D2003000E65F1 /* OTRemovePeersOperation.h */; };
+               DC8757F5218D2003000E65F1 /* OTRemovePeersOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8757F3218D2003000E65F1 /* OTRemovePeersOperation.m */; };
+               DC880F68243D4CC00059806D /* CKKSLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC880F67243D4CC00059806D /* CKKSLogging.m */; };
+               DC880F69243D4CE50059806D /* CKKSLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC880F67243D4CC00059806D /* CKKSLogging.m */; };
+               DC880F6A243D4D640059806D /* CKKSLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC880F67243D4CC00059806D /* CKKSLogging.m */; };
+               DC880F6B243D4D730059806D /* CKKSLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC880F67243D4CC00059806D /* CKKSLogging.m */; };
+               DC880F6C243D4DC00059806D /* CKKSLogging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC880F67243D4CC00059806D /* CKKSLogging.m */; };

                DC8834521D8A21AA00CE0ACA /* SecAsn1Coder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */; };
                DC8834541D8A21AA00CE0ACA /* SecAsn1Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */; };
                DC8834571D8A21AA00CE0ACA /* certExtensionTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */; };
                DC8834521D8A21AA00CE0ACA /* SecAsn1Coder.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */; };
                DC8834541D8A21AA00CE0ACA /* SecAsn1Templates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */; };
                DC8834571D8A21AA00CE0ACA /* certExtensionTemplates.c in Sources */ = {isa = PBXBuildFile; fileRef = DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */; };


@@ -3557,63 +4265,129 @@
                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 */; };
                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 */; };

+               DC88466B22373A5E00738068 /* TPPBDictionaryMatchingRule.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC88466922373A4000738068 /* TPPBDictionaryMatchingRule.proto */; };
+               DC89608D2395C75600D339D9 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC89608C2395C75500D339D9 /* CoreServices.framework */; };
+               DC89608E2395C76300D339D9 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC89608C2395C75500D339D9 /* CoreServices.framework */; };

                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8D238C2064649400E163C8 /* CKKSAPSHandlingTests.m */; };
                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC8D238C2064649400E163C8 /* CKKSAPSHandlingTests.m */; };

+               DC8DF6DC212F8A7C007B3FE8 /* OTSOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB9475C2127562100ED9272 /* OTSOSAdapter.m */; };
+               DC8DF6DF212F8A7D007B3FE8 /* OTSOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB9475C2127562100ED9272 /* OTSOSAdapter.m */; };
+               DC8E3DC4224460C6003D86DB /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };

                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, ); }; };
                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, ); }; };

+               DC9061B922B02BA30071474D /* TPTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9061B822B02BA30071474D /* TPTypes.m */; };

                DC9082C41EA0277600D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                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 */; };
                DC9082C61EA027DB00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };

-               DC9082C71EA027DC00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */; };
+               DC90A4C721F279D4001300EB /* SecEscrowPendingRecord.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC90A4C621F279D4001300EB /* SecEscrowPendingRecord.proto */; };

                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 */; };
                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 */; };

+               DC93F02922387A010072720A /* OTSOSUpdatePreapprovalsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC93F02722387A010072720A /* OTSOSUpdatePreapprovalsOperation.h */; };
+               DC93F02A22387A010072720A /* OTSOSUpdatePreapprovalsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC93F02822387A010072720A /* OTSOSUpdatePreapprovalsOperation.m */; };
+               DC947E8524638320005B8669 /* CKKSCheckKeyHierarchyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC947E832463831F005B8669 /* CKKSCheckKeyHierarchyOperation.m */; };

                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                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 */; };
                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };

-               DC94BCCD1F10448600E07CEB /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };

                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC963E7E1D95EBB1008A153E /* libsecurity_apple_csp.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCF784F81D88B63800E694BB /* libsecurity_apple_csp.plist */; };
                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 */; };
                DC963EC61D95F646008A153E /* der_plist.h in Headers */ = {isa = PBXBuildFile; fileRef = 524492931AFD6D480043695A /* der_plist.h */; };
                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC963E7E1D95EBB1008A153E /* libsecurity_apple_csp.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCF784F81D88B63800E694BB /* libsecurity_apple_csp.plist */; };
                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 */; };
                DC963EC61D95F646008A153E /* der_plist.h in Headers */ = {isa = PBXBuildFile; fileRef = 524492931AFD6D480043695A /* der_plist.h */; };

+               DC9978B82404AA3200A5EE2F /* Container_UserSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC9978B72404AA3200A5EE2F /* Container_UserSync.swift */; };
+               DC9978B92404AA3200A5EE2F /* Container_UserSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC9978B72404AA3200A5EE2F /* Container_UserSync.swift */; };
+               DC9978BB2404B26900A5EE2F /* Container_UserSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC9978B72404AA3200A5EE2F /* Container_UserSync.swift */; };
+               DC99B86B20EACA470065B73B /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               DC99B86C20EACA470065B73B /* FakeCuttlefish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEA8557F20B5DC7D00D5AD11 /* FakeCuttlefish.swift */; };
+               DC99B86D20EACA470065B73B /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               DC99B86E20EACA470065B73B /* MockCuttlefish.swift in Sources */ = {isa = PBXBuildFile; fileRef = BED987E220991C4D00607A5F /* MockCuttlefish.swift */; };
+               DC99B86F20EACA470065B73B /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
+               DC99B87020EACA470065B73B /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               DC99B87120EACA470065B73B /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DC99B87220EACA470065B73B /* Cuttlefish.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */; };
+               DC99B87320EACA470065B73B /* Decrypter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D11206C121400B53D16 /* Decrypter.swift */; };
+               DC99B87420EACA470065B73B /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               DC99B87520EACA470065B73B /* TrustedPeersHelper.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */; };
+               DC99B87720EACA470065B73B /* ContainerSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE4C6AB120CAF4E500EAD6BE /* ContainerSync.swift */; };
+               DC99B87820EACA470065B73B /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D0F206C099800B53D16 /* Container.swift */; };
+               DC99B87920EACA470065B73B /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC0A96320B362EC00DBD772 /* Utils.swift */; };
+               DC99B87B20EACA470065B73B /* libbsm.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EB49B2DC202DF251003F34A0 /* libbsm.tbd */; };
+               DC99B87C20EACA470065B73B /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               DC99B87F20EACA470065B73B /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246911F9AE2E400D63882 /* libDER.a */; };
+               DC99B88020EACA470065B73B /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };
+               DC99B88220EACA470065B73B /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; };
+               DC99B88320EACA470065B73B /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               DC99B88420EACA470065B73B /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
+               DC99B88520EACA470065B73B /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               DC99B88620EACA470065B73B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               DC99B88920EACA470065B73B /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               DC99B88A20EACA470065B73B /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               DC99B88B20EACA470065B73B /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                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, ); }; };
                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, ); }; };

+               DC9C06692149DFE400C6F7B8 /* OTAuthKitAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9C06672149DFE400C6F7B8 /* OTAuthKitAdapter.h */; };
+               DC9C066B2149DFE400C6F7B8 /* OTAuthKitAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C06682149DFE400C6F7B8 /* OTAuthKitAdapter.m */; };
+               DC9C066D2149E33D00C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DC9C066E2149E35F00C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DC9C066F2149E36900C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DC9C06702149E3CB00C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DC9C06712149E6B900C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DC9C06722149E6F500C6F7B8 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };

                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 */; };
                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 */; };
                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 */; };
+               DC9C98C722E264F30021E29F /* CKKSFetchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C98C622E264F30021E29F /* CKKSFetchTests.m */; };

                DC9FD32C1F85990A00C8AAC8 /* CKKSPeer.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */; };
                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 */; };
+               DCA143341FE0802C00A40D59 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCA1433C1FE0803200A40D59 /* OTControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBF0B1FCB452200580909 /* OTControl.h */; settings = {ATTRIBUTES = (Private, ); }; };

                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                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 */; };
                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };

-               DCA4D2161E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };

                DCA4D2171E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };
                DCA4D2171E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };

-               DCA4D2181E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };
+               DCA7F7EF23A44AA200927989 /* OctagonPolicyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCA7F7EE23A44AA200927989 /* OctagonPolicyTests.swift */; };

                DCA85B931E8D97E400BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B941E8D97E400BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B931E8D97E400BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B941E8D97E400BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };

-               DCA85B961E8D980100BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };

                DCA85B971E8D980200BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B981E8D980A00BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCA85B991E8D980B00BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCA85B971E8D980200BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B981E8D980A00BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCA85B991E8D980B00BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };

-               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 */; };
                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 */; };
+               DCA992AD2400BB99007959AF /* TPPBAncientEpoch.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.proto */; };
+               DCA9BC02221B721E00B4EB26 /* CKKSCloudKitClassDependencies.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA9BC00221B721D00B4EB26 /* CKKSCloudKitClassDependencies.h */; };
+               DCA9BC03221B721E00B4EB26 /* CKKSCloudKitClassDependencies.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9BC01221B721E00B4EB26 /* CKKSCloudKitClassDependencies.m */; };
+               DCA9BC07221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9BC06221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m */; };
+               DCA9D83E21FFE51A00B27421 /* EscrowRequestXPCServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9D83C21FFE50900B27421 /* EscrowRequestXPCServer.m */; };
+               DCA9D84121FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA9D83F21FFE62A00B27421 /* EscrowRequestXPCProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCA9D84221FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA9D83F21FFE62A00B27421 /* EscrowRequestXPCProtocol.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCA9D84621FFE7CF00B27421 /* EscrowRequestXPCProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9D84521FFE7CF00B27421 /* EscrowRequestXPCProtocol.m */; };
+               DCA9D84721FFE7CF00B27421 /* EscrowRequestXPCProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9D84521FFE7CF00B27421 /* EscrowRequestXPCProtocol.m */; };
+               DCA9D84821FFEE9800B27421 /* EscrowRequestXPCProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9D84521FFE7CF00B27421 /* EscrowRequestXPCProtocol.m */; };
+               DCA9D84D21FFF04700B27421 /* EscrowRequestServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA9D84B21FFF04600B27421 /* EscrowRequestServer.h */; };
+               DCA9D84E21FFF04700B27421 /* EscrowRequestServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9D84C21FFF04700B27421 /* EscrowRequestServer.m */; };
+               DCAA209A23AAF8F600DCB594 /* Container_RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */; };
+               DCAA209B23AAF8FD00DCB594 /* Container_RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */; };
+               DCAA209C23AAF93700DCB594 /* Container_RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */; };
+               DCAAF3362493F9C600D4EB55 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EAFA4CD1EF16059002DC188 /* LocalAuthentication.framework */; };
+               DCAB14271E40039600C81511 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };
+               DCAB17CE21FFF75B00E1DFCF /* MockSynchronousEscrowServer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAB17CC21FFF6C400E1DFCF /* MockSynchronousEscrowServer.m */; };
+               DCAB17D12200D26900E1DFCF /* SecEscrowPendingRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAB17CF2200D26700E1DFCF /* SecEscrowPendingRecord.h */; };
+               DCAB17D22200D26900E1DFCF /* SecEscrowPendingRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAB17D02200D26800E1DFCF /* SecEscrowPendingRecord.m */; };
+               DCAB17D52200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAB17D32200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.h */; };
+               DCAB17D62200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAB17D42200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.m */; };
+               DCAB17DB2200E7A700E1DFCF /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCAD8F8622C43EC1007C3872 /* Container_MachineIDs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.swift */; };
+               DCAD8F8722C43ECA007C3872 /* Container_MachineIDs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.swift */; };
+               DCAD8F8922C43EDB007C3872 /* Container_MachineIDs.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.swift */; };
+               DCAD8F8C22C55D76007C3872 /* TPPBDispositionDisallowedMachineID.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD8F8A22C55D73007C3872 /* TPPBDispositionDisallowedMachineID.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCAD8F8D22C55D76007C3872 /* TPPBDispositionDisallowedMachineID.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD8F8B22C55D75007C3872 /* TPPBDispositionDisallowedMachineID.m */; };

                DCAD9B441F8D939C00C5E2AE /* CKKSFixups.h in Headers */ = {isa = PBXBuildFile; fileRef = DCAD9B421F8D939C00C5E2AE /* CKKSFixups.h */; };
                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 */; };
                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 */; };
                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
                DCAD9B491F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */; };
                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };

-               DCAE1DDE2073FDCD00B4F687 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               DCB0C291222F5E130083AECB /* CuttlefishErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */; };
+               DCB0C292222F5E1D0083AECB /* CuttlefishErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */; };
+               DCB0C295222F5EF60083AECB /* CuttlefishErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */; };

                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 */; };
                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 */; };


@@ -3622,10 +4396,9 @@
                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 */; };
                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 */; };
+               DCB24B45221B901700BE73FE /* CKKSMockSOSPresentAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA9BC06221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m */; };

                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, ); }; };
                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 */; };
                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 */; };


@@ -3785,8 +4558,6 @@
                DCB342291D8A2BAD0054D16E /* osxverifier.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341D41D8A2BAC0054D16E /* osxverifier.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCB3422A1D8A2BAD0054D16E /* u32handleobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */; };
                DCB3422B1D8A2BAD0054D16E /* u32handleobject.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341D61D8A2BAC0054D16E /* u32handleobject.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCB342291D8A2BAD0054D16E /* osxverifier.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341D41D8A2BAC0054D16E /* osxverifier.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCB3422A1D8A2BAD0054D16E /* u32handleobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */; };
                DCB3422B1D8A2BAD0054D16E /* u32handleobject.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341D61D8A2BAC0054D16E /* u32handleobject.h */; settings = {ATTRIBUTES = (Public, ); }; };

-               DCB3422C1D8A2BAD0054D16E /* uniformrandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB341D71D8A2BAC0054D16E /* uniformrandom.cpp */; };
-               DCB3422D1D8A2BAD0054D16E /* uniformrandom.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341D81D8A2BAC0054D16E /* uniformrandom.h */; settings = {ATTRIBUTES = (Public, ); }; };

                DCB3422E1D8A2BAD0054D16E /* walkers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB341D91D8A2BAC0054D16E /* walkers.cpp */; };
                DCB3422F1D8A2BAD0054D16E /* walkers.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341DA1D8A2BAC0054D16E /* walkers.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCB342341D8A2C6B0054D16E /* KeySchema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342311D8A2C6B0054D16E /* KeySchema.cpp */; };
                DCB3422E1D8A2BAD0054D16E /* walkers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB341D91D8A2BAC0054D16E /* walkers.cpp */; };
                DCB3422F1D8A2BAD0054D16E /* walkers.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB341DA1D8A2BAC0054D16E /* walkers.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCB342341D8A2C6B0054D16E /* KeySchema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342311D8A2C6B0054D16E /* KeySchema.cpp */; };


@@ -3796,7 +4567,6 @@
                DCB342FB1D8A32A20054D16E /* SecBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342441D8A32A20054D16E /* SecBase.cpp */; };
                DCB342FC1D8A32A20054D16E /* SecBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342451D8A32A20054D16E /* SecBridge.h */; };
                DCB342FD1D8A32A20054D16E /* SecCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342461D8A32A20054D16E /* SecCertificate.cpp */; };
                DCB342FB1D8A32A20054D16E /* SecBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342441D8A32A20054D16E /* SecBase.cpp */; };
                DCB342FC1D8A32A20054D16E /* SecBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342451D8A32A20054D16E /* SecBridge.h */; };
                DCB342FD1D8A32A20054D16E /* SecCertificate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342461D8A32A20054D16E /* SecCertificate.cpp */; };

-               DCB342FE1D8A32A20054D16E /* SecCertificateBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342471D8A32A20054D16E /* SecCertificateBundle.cpp */; };

                DCB343001D8A32A20054D16E /* SecIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342491D8A32A20054D16E /* SecIdentity.cpp */; };
                DCB343011D8A32A20054D16E /* SecIdentitySearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */; };
                DCB343021D8A32A20054D16E /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB3424B1D8A32A20054D16E /* SecItemConstants.c */; };
                DCB343001D8A32A20054D16E /* SecIdentity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342491D8A32A20054D16E /* SecIdentity.cpp */; };
                DCB343011D8A32A20054D16E /* SecIdentitySearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */; };
                DCB343021D8A32A20054D16E /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB3424B1D8A32A20054D16E /* SecItemConstants.c */; };


@@ -3847,7 +4617,6 @@
                DCB3435A1D8A32A20054D16E /* PolicyCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342A51D8A32A20054D16E /* PolicyCursor.h */; };
                DCB3435B1D8A32A20054D16E /* SecCFTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */; };
                DCB3435C1D8A32A20054D16E /* SecCFTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342A71D8A32A20054D16E /* SecCFTypes.h */; };
                DCB3435A1D8A32A20054D16E /* PolicyCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342A51D8A32A20054D16E /* PolicyCursor.h */; };
                DCB3435B1D8A32A20054D16E /* SecCFTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */; };
                DCB3435C1D8A32A20054D16E /* SecCFTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342A71D8A32A20054D16E /* SecCFTypes.h */; };

-               DCB3435D1D8A32A20054D16E /* SecKeychainAddIToolsPassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342A81D8A32A20054D16E /* SecKeychainAddIToolsPassword.cpp */; };

                DCB3435E1D8A32A20054D16E /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342AA1D8A32A20054D16E /* StorageManager.cpp */; };
                DCB3435F1D8A32A20054D16E /* Trust.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342AB1D8A32A20054D16E /* Trust.cpp */; };
                DCB343601D8A32A20054D16E /* Trust.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342AC1D8A32A20054D16E /* Trust.h */; };
                DCB3435E1D8A32A20054D16E /* StorageManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342AA1D8A32A20054D16E /* StorageManager.cpp */; };
                DCB3435F1D8A32A20054D16E /* Trust.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCB342AB1D8A32A20054D16E /* Trust.cpp */; };
                DCB343601D8A32A20054D16E /* Trust.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB342AC1D8A32A20054D16E /* Trust.h */; };


@@ -3967,33 +4736,69 @@
                DCB344A51D8A35270054D16E /* si-20-sectrust-provisioning.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB344701D8A35270054D16E /* si-20-sectrust-provisioning.h */; };
                DCB344A61D8A35270054D16E /* si-33-keychain-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB344711D8A35270054D16E /* si-33-keychain-backup.c */; };
                DCB344A71D8A35270054D16E /* si-34-one-true-keychain.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB344721D8A35270054D16E /* si-34-one-true-keychain.c */; };
                DCB344A51D8A35270054D16E /* si-20-sectrust-provisioning.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB344701D8A35270054D16E /* si-20-sectrust-provisioning.h */; };
                DCB344A61D8A35270054D16E /* si-33-keychain-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB344711D8A35270054D16E /* si-33-keychain-backup.c */; };
                DCB344A71D8A35270054D16E /* si-34-one-true-keychain.c in Sources */ = {isa = PBXBuildFile; fileRef = DCB344721D8A35270054D16E /* si-34-one-true-keychain.c */; };

-               DCB515DE1ED3CF86001F1152 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
-               DCB515DF1ED3CF95001F1152 /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
-               DCB515E01ED3D111001F1152 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
-               DCB515E11ED3D11A001F1152 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
-               DCB515E21ED3D134001F1152 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
-               DCB515E31ED3D135001F1152 /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
-               DCB515E41ED3D15A001F1152 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
+               DCB41DF1216C2DBB00F219E0 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DCB41DF4216C2DD300F219E0 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
+               DCB41DFC216D5E5B00F219E0 /* OTAccountMetadataClassC+KeychainSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7EB921211E17E500516452 /* OTAccountMetadataClassC+KeychainSupport.m */; };
+               DCB41E01216D5FE500F219E0 /* OctagonDataPersistenceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC7EB928211E20DF00516452 /* OctagonDataPersistenceTests.swift */; };
+               DCB4584C2240396E00115F8C /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
+               DCB468DF20EC25FF00BA7E5B /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE55C77B2044D0C90045863D /* Client.swift */; };
+               DCB468E520EC262C00BA7E5B /* ContainerMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */; };
+               DCB55175247F48290009A859 /* CKKSDeleteCKZoneOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB55173247F48290009A859 /* CKKSDeleteCKZoneOperation.h */; };
+               DCB55176247F48290009A859 /* CKKSDeleteCKZoneOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB55174247F48290009A859 /* CKKSDeleteCKZoneOperation.m */; };
+               DCB55177247F483D0009A859 /* CKKSCreateCKZoneOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5516B247F3DB50009A859 /* CKKSCreateCKZoneOperation.m */; };

                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */; };
                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */; };

-               DCB5D93C1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */; };

                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */; };
                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */; };

-               DCB5D93E1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */; };

                DCB7D8C31D8E181B00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB7D8D01D8E183C00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB7D8D11D8E185900867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */; };
                DCB7D8C31D8E181B00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB7D8D01D8E183C00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB7D8D11D8E185900867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */; };

-               DCB837381ED5045100015C07 /* CKKSLockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */; };
+               DCB946AF22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB946AD22FCB88400BE4490 /* OTDetermineHSA2AccountStatusOperation.h */; };
+               DCB946B022FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB946AE22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m */; };
+               DCB9475621274A1900ED9272 /* TPHObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB9475421274A1900ED9272 /* TPHObjcTranslation.m */; };
+               DCB9475821274F9D00ED9272 /* TPHObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB9475421274A1900ED9272 /* TPHObjcTranslation.m */; };
+               DCB9475A2127534C00ED9272 /* OctagonTests+SOSUpgrade.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB947592127534C00ED9272 /* OctagonTests+SOSUpgrade.swift */; };
+               DCBA6F2924105399009A5187 /* CKKSTests+ForwardCompatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBA6F2824105399009A5187 /* CKKSTests+ForwardCompatibility.m */; };

                DCBB8AC41D80DD95007ED154 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };
                DCBB8AC41D80DD95007ED154 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };

-               DCBDB3B81E57C82300B61300 /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };

                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };
                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };

-               DCBDB3BC1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };

                DCBDB3BD1E57CA7A00B61300 /* CKKSViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */; };
                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 */; };
                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 */; };
+               DCBF4A9A21FFC82100539F0A /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               DCBF4AAE21FFC82100539F0A /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
+               DCBF4AB521FFC82100539F0A /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               DCBF4AB621FFC82100539F0A /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               DCBF4AB721FFC82100539F0A /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               DCBF4ABA21FFC82100539F0A /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               DCBF4ABB21FFC82100539F0A /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
+               DCBF4ABE21FFC82100539F0A /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               DCBF4AC221FFC82100539F0A /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               DCBF4AC321FFC82100539F0A /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
+               DCBF4AC421FFC82100539F0A /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
+               DCBF4AC521FFC82100539F0A /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DCBF4AC621FFC82100539F0A /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
+               DCBF4AC721FFC82100539F0A /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */; };
+               DCBF4AC821FFC82100539F0A /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };
+               DCBF4AC921FFC82100539F0A /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
+               DCBF4ACA21FFC82100539F0A /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
+               DCBF4ACB21FFC82100539F0A /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
+               DCBF4ACC21FFC82100539F0A /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               DCBF4ACD21FFC82100539F0A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               DCBF4ACE21FFC82100539F0A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
+               DCBF4ACF21FFC82100539F0A /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3502E81E02172C00BC0587 /* OCMock.framework */; };
+               DCBF4AD021FFC82100539F0A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               DCBF4AD121FFC82100539F0A /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
+               DCBF4AD221FFC82100539F0A /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
+               DCBF4AD321FFC82100539F0A /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
+               DCBF4AD421FFC82100539F0A /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
+               DCBF4AD521FFC82100539F0A /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
+               DCBF4AD621FFC82100539F0A /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
+               DCBF4AD721FFC82100539F0A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
+               DCBF4AE521FFC9B300539F0A /* SecEscrowRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBF4AE321FFC9A800539F0A /* SecEscrowRequestTests.m */; };
+               DCBFF832222611A200C5C044 /* OTFetchCKKSKeysOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBFF830222611A200C5C044 /* OTFetchCKKSKeysOperation.h */; };
+               DCBFF833222611A200C5C044 /* OTFetchCKKSKeysOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBFF831222611A200C5C044 /* OTFetchCKKSKeysOperation.m */; };
+               DCC03FA423FF521100A4DA3F /* TPSyncingPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC03FA223FF521100A4DA3F /* TPSyncingPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               DCC03FA523FF521100A4DA3F /* TPSyncingPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC03FA323FF521100A4DA3F /* TPSyncingPolicy.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 */; };
                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 */; };


@@ -4002,10 +4807,15 @@
                DCC0937E1D80B0A700F984E4 /* SecOTRPacketData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF915AFB73800B9D400 /* SecOTRPacketData.h */; };
                DCC0937F1D80B0B100F984E4 /* SecOTRMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF715AFB73800B9D400 /* SecOTRMath.h */; };
                DCC093801D80B0B700F984E4 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; };
                DCC0937E1D80B0A700F984E4 /* SecOTRPacketData.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF915AFB73800B9D400 /* SecOTRPacketData.h */; };
                DCC0937F1D80B0B100F984E4 /* SecOTRMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF715AFB73800B9D400 /* SecOTRMath.h */; };
                DCC093801D80B0B700F984E4 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; };

-               DCC19F711EB9151B00B7D70F /* KeychainCKKS.plist in Copy BATS Test Discovery Plist */ = {isa = PBXBuildFile; fileRef = 6CB5F4781E402E5700DBF3F0 /* KeychainCKKS.plist */; };
+               DCC19518214C53FD00C9E0B6 /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
+               DCC1951C214C668A00C9E0B6 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               DCC40B112383786D00402CB9 /* CKKSStates.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC40B0F2383786D00402CB9 /* CKKSStates.h */; };
+               DCC40B122383786D00402CB9 /* CKKSStates.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC40B102383786D00402CB9 /* CKKSStates.m */; };
+               DCC51C99209B7C1500A40387 /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DC52EA951D80CC2A00B0A59C /* print_cert.c */; };
+               DCC54181225C05180095D926 /* OTUploadNewCKKSTLKsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC5417F225C05170095D926 /* OTUploadNewCKKSTLKsOperation.h */; };
+               DCC54182225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC54180225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m */; };

                DCC585FF20BF8A7E005C7269 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCC5860020BF8A7E005C7269 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCC585FF20BF8A7E005C7269 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCC5860020BF8A7E005C7269 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };

-               DCC5860320BF8A98005C7269 /* SecBase.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC5860120BF8A98005C7269 /* SecBase.h */; };

                DCC5BF1B1D93723A008D1E84 /* libsecurity_apple_csp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF783141D88B4DE00E694BB /* libsecurity_apple_csp.a */; };
                DCC5BF1C1D937242008D1E84 /* libsecurity_apple_cspdl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF785E51D88B95500E694BB /* libsecurity_apple_cspdl.a */; };
                DCC5BF1D1D937249008D1E84 /* libsecurity_apple_file_dl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF7883B1D88C8C400E694BB /* libsecurity_apple_file_dl.a */; };
                DCC5BF1B1D93723A008D1E84 /* libsecurity_apple_csp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF783141D88B4DE00E694BB /* libsecurity_apple_csp.a */; };
                DCC5BF1C1D937242008D1E84 /* libsecurity_apple_cspdl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF785E51D88B95500E694BB /* libsecurity_apple_cspdl.a */; };
                DCC5BF1D1D937249008D1E84 /* libsecurity_apple_file_dl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCF7883B1D88C8C400E694BB /* libsecurity_apple_file_dl.a */; };


@@ -4013,7 +4823,6 @@
                DCC5BF1F1D93725A008D1E84 /* libsecurity_authorization.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3406D1D8A24DF0054D16E /* libsecurity_authorization.a */; };
                DCC5BF201D937263008D1E84 /* libsecurity_cdsa_plugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341371D8A2A010054D16E /* libsecurity_cdsa_plugin.a */; };
                DCC5BF211D937269008D1E84 /* libsecurity_checkpw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5B71D8B71FD00070CB0 /* libsecurity_checkpw.a */; };
                DCC5BF1F1D93725A008D1E84 /* libsecurity_authorization.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3406D1D8A24DF0054D16E /* libsecurity_authorization.a */; };
                DCC5BF201D937263008D1E84 /* libsecurity_cdsa_plugin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341371D8A2A010054D16E /* libsecurity_cdsa_plugin.a */; };
                DCC5BF211D937269008D1E84 /* libsecurity_checkpw.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5B71D8B71FD00070CB0 /* libsecurity_checkpw.a */; };

-               DCC5BF221D937270008D1E84 /* libsecurity_cms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1002C91D8E19D70025549C /* libsecurity_cms.a */; };

                DCC5BF231D937277008D1E84 /* libsecurity_comcryption.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5E91D8B742200070CB0 /* libsecurity_comcryption.a */; };
                DCC5BF241D93727E008D1E84 /* libsecurity_cryptkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5FF1D8B752B00070CB0 /* libsecurity_cryptkit.a */; };
                DCC5BF251D937288008D1E84 /* libsecurity_cssm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC74C1D8B771600070CB0 /* libsecurity_cssm.a */; };
                DCC5BF231D937277008D1E84 /* libsecurity_comcryption.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5E91D8B742200070CB0 /* libsecurity_comcryption.a */; };
                DCC5BF241D93727E008D1E84 /* libsecurity_cryptkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC5FF1D8B752B00070CB0 /* libsecurity_cryptkit.a */; };
                DCC5BF251D937288008D1E84 /* libsecurity_cssm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC74C1D8B771600070CB0 /* libsecurity_cssm.a */; };


@@ -4024,11 +4833,14 @@
                DCC5BF2A1D93729E008D1E84 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                DCC5BF2B1D9372A4008D1E84 /* libsecurity_transform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA801D8B858600070CB0 /* libsecurity_transform.a */; };
                DCC5BF2C1D9372AA008D1E84 /* libsecurity_translocate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCB081D8B894F00070CB0 /* libsecurity_translocate.a */; };
                DCC5BF2A1D93729E008D1E84 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                DCC5BF2B1D9372A4008D1E84 /* libsecurity_transform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA801D8B858600070CB0 /* libsecurity_transform.a */; };
                DCC5BF2C1D9372AA008D1E84 /* libsecurity_translocate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCB081D8B894F00070CB0 /* libsecurity_translocate.a */; };

+               DCC67E0E20DD7E0A00A70A31 /* OTStates.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC67E0C20DD7E0A00A70A31 /* OTStates.h */; };
+               DCC67E1020DD7E0A00A70A31 /* OTStates.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC67E0D20DD7E0A00A70A31 /* OTStates.m */; };
+               DCC67E2D20DDC07900A70A31 /* OTPrepareOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC67E2B20DDC07900A70A31 /* OTPrepareOperation.h */; };
+               DCC67E2F20DDC07900A70A31 /* OTPrepareOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC67E2C20DDC07900A70A31 /* OTPrepareOperation.m */; };

                DCC78EB81D80899C00865A7C /* vmdh.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9C1D8085FC00865A7C /* vmdh.c */; };
                DCC78EB91D8089A700865A7C /* pbkdf2.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2E1D8085FC00865A7C /* pbkdf2.c */; };
                DCC78EBA1D8089BD00865A7C /* p12pbegen.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2C1D8085FC00865A7C /* p12pbegen.c */; };
                DCC78EBB1D8089C200865A7C /* p12import.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2A1D8085FC00865A7C /* p12import.c */; };
                DCC78EB81D80899C00865A7C /* vmdh.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9C1D8085FC00865A7C /* vmdh.c */; };
                DCC78EB91D8089A700865A7C /* pbkdf2.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2E1D8085FC00865A7C /* pbkdf2.c */; };
                DCC78EBA1D8089BD00865A7C /* p12pbegen.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2C1D8085FC00865A7C /* p12pbegen.c */; };
                DCC78EBB1D8089C200865A7C /* p12import.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E2A1D8085FC00865A7C /* p12import.c */; };

-               DCC78EBC1D8089CD00865A7C /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E191D8085FC00865A7C /* verify_cert.c */; };

                DCC78EBD1D808A0400865A7C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DCC78EBE1D808A0E00865A7C /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
                DCC78EC01D808A1C00865A7C /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };
                DCC78EBD1D808A0400865A7C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
                DCC78EBE1D808A0E00865A7C /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
                DCC78EC01D808A1C00865A7C /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };


@@ -4051,7 +4863,7 @@
                DCC78ED11D808A8E00865A7C /* SecOTRFullIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E6C1D8085FC00865A7C /* SecOTRFullIdentity.c */; };
                DCC78ED21D808A9500865A7C /* SecOTRDHKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E691D8085FC00865A7C /* SecOTRDHKey.c */; };
                DCC78ED31D808AA000865A7C /* SecKeyAdaptors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */; };
                DCC78ED11D808A8E00865A7C /* SecOTRFullIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E6C1D8085FC00865A7C /* SecOTRFullIdentity.c */; };
                DCC78ED21D808A9500865A7C /* SecOTRDHKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E691D8085FC00865A7C /* SecOTRDHKey.c */; };
                DCC78ED31D808AA000865A7C /* SecKeyAdaptors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */; };

-               DCC78ED41D808AA800865A7C /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.c */; };
+               DCC78ED41D808AA800865A7C /* SecKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.m */; };

                DCC78ED51D808AAE00865A7C /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */; };
                DCC78ED61D808ABA00865A7C /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */; };
                DCC78ED71D808AC000865A7C /* SecItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E581D8085FC00865A7C /* SecItem.c */; };
                DCC78ED51D808AAE00865A7C /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */; };
                DCC78ED61D808ABA00865A7C /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */; };
                DCC78ED71D808AC000865A7C /* SecItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E581D8085FC00865A7C /* SecItem.c */; };


@@ -4069,7 +4881,6 @@
                DCC78EE51D808B2100865A7C /* SecBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E351D8085FC00865A7C /* SecBase64.c */; };
                DCC78EE61D808B2A00865A7C /* SecAccessControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E301D8085FC00865A7C /* SecAccessControl.m */; };
                DCC78EE71D808B2F00865A7C /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.c */; };
                DCC78EE51D808B2100865A7C /* SecBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E351D8085FC00865A7C /* SecBase64.c */; };
                DCC78EE61D808B2A00865A7C /* SecAccessControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E301D8085FC00865A7C /* SecAccessControl.m */; };
                DCC78EE71D808B2F00865A7C /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D9E1D8085F200865A7C /* secViewDisplay.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, ); }; };
                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                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, ); }; };
                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };


@@ -4082,9 +4893,9 @@
                DCCD33E91E3FFDBF00AA4AD1 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                DCCD34001E4001AD00AA4AD1 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                DCCD88E81E42622200F5AA71 /* CKKSGroupOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */; };
                DCCD33E91E3FFDBF00AA4AD1 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                DCCD34001E4001AD00AA4AD1 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                DCCD88E81E42622200F5AA71 /* CKKSGroupOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */; };

-               DCCD88E91E42622200F5AA71 /* CKKSGroupOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */; };

                DCCD88EA1E42622200F5AA71 /* CKKSGroupOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */; };
                DCCD88EA1E42622200F5AA71 /* CKKSGroupOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */; };

-               DCCD88EB1E42622200F5AA71 /* CKKSGroupOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */; };
+               DCCFB14E212394EC003D2DA2 /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.a */; };
+               DCCFB14F21239534003D2DA2 /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.a */; };

                DCD0676E1D8CDECD007602F1 /* gkmerge in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067631D8CDEB2007602F1 /* gkmerge */; };
                DCD0676F1D8CDED1007602F1 /* gkhandmake in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067641D8CDEB2007602F1 /* gkhandmake */; };
                DCD067701D8CDED5007602F1 /* gklist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067651D8CDEB2007602F1 /* gklist */; };
                DCD0676E1D8CDECD007602F1 /* gkmerge in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067631D8CDEB2007602F1 /* gkmerge */; };
                DCD0676F1D8CDED1007602F1 /* gkhandmake in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067641D8CDEB2007602F1 /* gkhandmake */; };
                DCD067701D8CDED5007602F1 /* gklist in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCD067651D8CDEB2007602F1 /* gklist */; };


@@ -4151,8 +4962,6 @@
                DCD0684E1D8CDF7E007602F1 /* cskernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */; };
                DCD0684F1D8CDF7E007602F1 /* csprocess.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067CB1D8CDF7E007602F1 /* csprocess.h */; };
                DCD068501D8CDF7E007602F1 /* csprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */; };
                DCD0684E1D8CDF7E007602F1 /* cskernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */; };
                DCD0684F1D8CDF7E007602F1 /* csprocess.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067CB1D8CDF7E007602F1 /* csprocess.h */; };
                DCD068501D8CDF7E007602F1 /* csprocess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */; };

-               DCD068511D8CDF7E007602F1 /* csgeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067CD1D8CDF7E007602F1 /* csgeneric.h */; };
-               DCD068521D8CDF7E007602F1 /* csgeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067CE1D8CDF7E007602F1 /* csgeneric.cpp */; };

                DCD068531D8CDF7E007602F1 /* diskrep.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067D01D8CDF7E007602F1 /* diskrep.h */; };
                DCD068541D8CDF7E007602F1 /* diskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067D11D8CDF7E007602F1 /* diskrep.cpp */; };
                DCD068551D8CDF7E007602F1 /* filediskrep.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067D21D8CDF7E007602F1 /* filediskrep.h */; };
                DCD068531D8CDF7E007602F1 /* diskrep.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067D01D8CDF7E007602F1 /* diskrep.h */; };
                DCD068541D8CDF7E007602F1 /* diskrep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD067D11D8CDF7E007602F1 /* diskrep.cpp */; };
                DCD068551D8CDF7E007602F1 /* filediskrep.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067D21D8CDF7E007602F1 /* filediskrep.h */; };


@@ -4283,8 +5092,6 @@
                DCD069431D8CDFFF007602F1 /* TokenStreamRewriteEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068EF1D8CDFFE007602F1 /* TokenStreamRewriteEngine.cpp */; };
                DCD069441D8CDFFF007602F1 /* TokenStreamSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068F01D8CDFFE007602F1 /* TokenStreamSelector.cpp */; };
                DCD069451D8CDFFF007602F1 /* TreeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068F11D8CDFFE007602F1 /* TreeParser.cpp */; };
                DCD069431D8CDFFF007602F1 /* TokenStreamRewriteEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068EF1D8CDFFE007602F1 /* TokenStreamRewriteEngine.cpp */; };
                DCD069441D8CDFFF007602F1 /* TokenStreamSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068F01D8CDFFE007602F1 /* TokenStreamSelector.cpp */; };
                DCD069451D8CDFFF007602F1 /* TreeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD068F11D8CDFFE007602F1 /* TreeParser.cpp */; };

-               DCD06A521D8CE29C007602F1 /* SecCodeHostLib.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD067E71D8CDF7E007602F1 /* SecCodeHostLib.h */; };
-               DCD06A531D8CE2A4007602F1 /* SecCodeHostLib.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD067E81D8CDF7E007602F1 /* SecCodeHostLib.c */; };

                DCD06A751D8CE2F0007602F1 /* gkunpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD0676B1D8CDEB2007602F1 /* gkunpack.cpp */; };
                DCD06A761D8CE2F7007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DCD06A781D8CE309007602F1 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD06A751D8CE2F0007602F1 /* gkunpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD0676B1D8CDEB2007602F1 /* gkunpack.cpp */; };
                DCD06A761D8CE2F7007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DCD06A781D8CE309007602F1 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };


@@ -4310,8 +5117,6 @@
                DCD06B4F1D8E0D7D007602F1 /* debugging_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B501D8E0D7D007602F1 /* debugsupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC41D8E0D7D007602F1 /* debugsupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B511D8E0D7D007602F1 /* debugging_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */; };
                DCD06B4F1D8E0D7D007602F1 /* debugging_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B501D8E0D7D007602F1 /* debugsupport.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC41D8E0D7D007602F1 /* debugsupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B511D8E0D7D007602F1 /* debugging_internal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */; };

-               DCD06B521D8E0D7D007602F1 /* devrandom.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC61D8E0D7D007602F1 /* devrandom.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DCD06B531D8E0D7D007602F1 /* devrandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AC71D8E0D7D007602F1 /* devrandom.cpp */; };

                DCD06B541D8E0D7D007602F1 /* dispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */; };
                DCD06B551D8E0D7D007602F1 /* dispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC91D8E0D7D007602F1 /* dispatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B561D8E0D7D007602F1 /* endian.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06ACA1D8E0D7D007602F1 /* endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B541D8E0D7D007602F1 /* dispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */; };
                DCD06B551D8E0D7D007602F1 /* dispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AC91D8E0D7D007602F1 /* dispatch.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B561D8E0D7D007602F1 /* endian.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06ACA1D8E0D7D007602F1 /* endian.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -4338,8 +5143,6 @@
                DCD06B6E1D8E0D7D007602F1 /* simpleprefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */; };
                DCD06B6F1D8E0D7D007602F1 /* sqlite++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE31D8E0D7D007602F1 /* sqlite++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B701D8E0D7D007602F1 /* sqlite++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */; };
                DCD06B6E1D8E0D7D007602F1 /* simpleprefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */; };
                DCD06B6F1D8E0D7D007602F1 /* sqlite++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE31D8E0D7D007602F1 /* sqlite++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B701D8E0D7D007602F1 /* sqlite++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */; };

-               DCD06B711D8E0D7D007602F1 /* streams.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE51D8E0D7D007602F1 /* streams.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DCD06B721D8E0D7D007602F1 /* streams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE61D8E0D7D007602F1 /* streams.cpp */; };

                DCD06B731D8E0D7D007602F1 /* superblob.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE71D8E0D7D007602F1 /* superblob.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B741D8E0D7D007602F1 /* superblob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE81D8E0D7D007602F1 /* superblob.cpp */; };
                DCD06B751D8E0D7D007602F1 /* threading.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE91D8E0D7D007602F1 /* threading.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B731D8E0D7D007602F1 /* superblob.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE71D8E0D7D007602F1 /* superblob.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B741D8E0D7D007602F1 /* superblob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06AE81D8E0D7D007602F1 /* superblob.cpp */; };
                DCD06B751D8E0D7D007602F1 /* threading.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06AE91D8E0D7D007602F1 /* threading.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -4366,12 +5169,8 @@
                DCD06B921D8E0D7D007602F1 /* unix++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B061D8E0D7D007602F1 /* unix++.cpp */; };
                DCD06B931D8E0D7D007602F1 /* unixchild.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B071D8E0D7D007602F1 /* unixchild.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B941D8E0D7D007602F1 /* unixchild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B081D8E0D7D007602F1 /* unixchild.cpp */; };
                DCD06B921D8E0D7D007602F1 /* unix++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B061D8E0D7D007602F1 /* unix++.cpp */; };
                DCD06B931D8E0D7D007602F1 /* unixchild.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B071D8E0D7D007602F1 /* unixchild.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B941D8E0D7D007602F1 /* unixchild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B081D8E0D7D007602F1 /* unixchild.cpp */; };

-               DCD06B951D8E0D7D007602F1 /* vproc++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B091D8E0D7D007602F1 /* vproc++.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DCD06B961D8E0D7D007602F1 /* vproc++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B0A1D8E0D7D007602F1 /* vproc++.cpp */; };

                DCD06B971D8E0D7D007602F1 /* mach++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B0C1D8E0D7D007602F1 /* mach++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B981D8E0D7D007602F1 /* mach++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */; };
                DCD06B971D8E0D7D007602F1 /* mach++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B0C1D8E0D7D007602F1 /* mach++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B981D8E0D7D007602F1 /* mach++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */; };

-               DCD06B991D8E0D7D007602F1 /* mach_notify.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B0E1D8E0D7D007602F1 /* mach_notify.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DCD06B9A1D8E0D7D007602F1 /* mach_notify.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B0F1D8E0D7D007602F1 /* mach_notify.c */; };

                DCD06B9B1D8E0D7D007602F1 /* cfmach++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B101D8E0D7D007602F1 /* cfmach++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B9C1D8E0D7D007602F1 /* cfmach++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */; };
                DCD06B9D1D8E0D7D007602F1 /* macho++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B121D8E0D7D007602F1 /* macho++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B9B1D8E0D7D007602F1 /* cfmach++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B101D8E0D7D007602F1 /* cfmach++.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06B9C1D8E0D7D007602F1 /* cfmach++.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */; };
                DCD06B9D1D8E0D7D007602F1 /* macho++.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B121D8E0D7D007602F1 /* macho++.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -4381,8 +5180,6 @@
                DCD06BA11D8E0D7D007602F1 /* dyld_cache_format.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA21D8E0D7D007602F1 /* machserver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B171D8E0D7D007602F1 /* machserver.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA31D8E0D7D007602F1 /* machserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B181D8E0D7D007602F1 /* machserver.cpp */; };
                DCD06BA11D8E0D7D007602F1 /* dyld_cache_format.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA21D8E0D7D007602F1 /* machserver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B171D8E0D7D007602F1 /* machserver.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA31D8E0D7D007602F1 /* machserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B181D8E0D7D007602F1 /* machserver.cpp */; };

-               DCD06BA41D8E0D7D007602F1 /* machrunloopserver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B191D8E0D7D007602F1 /* machrunloopserver.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               DCD06BA51D8E0D7D007602F1 /* machrunloopserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B1A1D8E0D7D007602F1 /* machrunloopserver.cpp */; };

                DCD06BA61D8E0D7D007602F1 /* coderepository.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B1C1D8E0D7D007602F1 /* coderepository.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA71D8E0D7D007602F1 /* coderepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B1D1D8E0D7D007602F1 /* coderepository.cpp */; };
                DCD06BA81D8E0D7D007602F1 /* cfclass.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B1E1D8E0D7D007602F1 /* cfclass.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA61D8E0D7D007602F1 /* coderepository.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B1C1D8E0D7D007602F1 /* coderepository.h */; settings = {ATTRIBUTES = (Public, ); }; };
                DCD06BA71D8E0D7D007602F1 /* coderepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCD06B1D1D8E0D7D007602F1 /* coderepository.cpp */; };
                DCD06BA81D8E0D7D007602F1 /* cfclass.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD06B1E1D8E0D7D007602F1 /* cfclass.h */; settings = {ATTRIBUTES = (Public, ); }; };


@@ -4400,25 +5197,25 @@
                DCD06BD51D8E173A007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DCD06BD61D8E175D007602F1 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCD06BD71D8E17A0007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DCD06BD51D8E173A007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };
                DCD06BD61D8E175D007602F1 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCD06BD71D8E17A0007602F1 /* libsecurity_codesigning.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD0677F1D8CDF19007602F1 /* libsecurity_codesigning.a */; };

-               DCD22D4B1D8CBF54001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D4B1D8CBF54001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D4C1D8CBF7E001C9B81 /* libsecurityd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6A82921D87749900418608 /* libsecurityd_client.a */; };
                DCD22D4D1D8CBF95001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D4E1D8CBFAB001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC58C1D8B70E700070CB0 /* libsecurity_cdsa_utils.a */; };
                DCD22D511D8CC039001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D521D8CC053001C9B81 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCD22D4C1D8CBF7E001C9B81 /* libsecurityd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6A82921D87749900418608 /* libsecurityd_client.a */; };
                DCD22D4D1D8CBF95001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D4E1D8CBFAB001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC58C1D8B70E700070CB0 /* libsecurity_cdsa_utils.a */; };
                DCD22D511D8CC039001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D521D8CC053001C9B81 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };

-               DCD22D531D8CC0EF001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D531D8CC0EF001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D541D8CC0FC001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D551D8CC148001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */; };
                DCD22D561D8CC154001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D571D8CC196001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };
                DCD22D541D8CC0FC001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D551D8CC148001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */; };
                DCD22D561D8CC154001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D571D8CC196001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };

-               DCD22D581D8CC1FA001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D581D8CC1FA001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D591D8CC200001C9B81 /* libsecurity_cdsa_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */; };
                DCD22D5A1D8CC205001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D5B1D8CC20D001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC58C1D8B70E700070CB0 /* libsecurity_cdsa_utils.a */; };
                DCD22D5C1D8CC224001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D5E1D8CC269001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */; };
                DCD22D5F1D8CC294001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };
                DCD22D591D8CC200001C9B81 /* libsecurity_cdsa_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */; };
                DCD22D5A1D8CC205001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D5B1D8CC20D001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC58C1D8B70E700070CB0 /* libsecurity_cdsa_utils.a */; };
                DCD22D5C1D8CC224001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D5E1D8CC269001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */; };
                DCD22D5F1D8CC294001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };

-               DCD22D601D8CC2EF001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D601D8CC2EF001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D611D8CC2F8001C9B81 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                DCD22D631D8CC33A001C9B81 /* libSOSRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC681D80D0C400B0A59C /* libSOSRegressions.a */; };
                DCD22D641D8CC341001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D611D8CC2F8001C9B81 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                DCD22D631D8CC33A001C9B81 /* libSOSRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52EC681D80D0C400B0A59C /* libSOSRegressions.a */; };
                DCD22D641D8CC341001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };


@@ -4430,11 +5227,11 @@
                DCD22D6E1D8CC71D001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D6F1D8CC728001C9B81 /* libsecurity_cdsa_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */; };
                DCD22D701D8CC733001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D6E1D8CC71D001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                DCD22D6F1D8CC728001C9B81 /* libsecurity_cdsa_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */; };
                DCD22D701D8CC733001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

-               DCD22D711D8CC78E001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D711D8CC78E001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D721D8CC804001C9B81 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                DCD22D751D8CC8A5001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D761D8CC8CF001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D721D8CC804001C9B81 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                DCD22D751D8CC8A5001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D761D8CC8CF001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

-               DCD22D771D8CC9CD001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D771D8CC9CD001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D781D8CC9D8001C9B81 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                DCD22D791D8CC9F1001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D801D8CCB0F001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D781D8CC9D8001C9B81 /* libsecurity_ssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC9CF1D8B824700070CB0 /* libsecurity_ssl.a */; };
                DCD22D791D8CC9F1001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D801D8CCB0F001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };


@@ -4444,13 +5241,13 @@
                DCD22D881D8CCBEF001C9B81 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; settings = {ATTRIBUTES = (Weak, ); }; };
                DCD22D891D8CCC1F001C9B81 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DCD22D8A1D8CCC23001C9B81 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
                DCD22D881D8CCBEF001C9B81 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; settings = {ATTRIBUTES = (Weak, ); }; };
                DCD22D891D8CCC1F001C9B81 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DCD22D8A1D8CCC23001C9B81 /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };

-               DCD22D8B1D8CCC58001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D8B1D8CCC58001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D8C1D8CCC63001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D8D1D8CCC79001C9B81 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DCD22D901D8CCCA0001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D911D8CCCB7001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D921D8CCD09001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };
                DCD22D8C1D8CCC63001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D8D1D8CCC79001C9B81 /* libregressionBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCBFD1D8C648C00070CB0 /* libregressionBase.a */; };
                DCD22D901D8CCCA0001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D911D8CCCB7001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D921D8CCD09001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };

-               DCD22D931D8CCD17001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D931D8CCD17001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D941D8CCDFA001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D951D8CCE5E001C9B81 /* libutilitiesRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */; };
                DCD22D961D8CCF08001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D941D8CCDFA001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D951D8CCE5E001C9B81 /* libutilitiesRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */; };
                DCD22D961D8CCF08001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };


@@ -4458,24 +5255,31 @@
                DCD22D981D8CCF78001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D991D8CCFB4001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };
                DCD22D9A1D8CCFC1001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D981D8CCF78001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                DCD22D991D8CCFB4001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */; };
                DCD22D9A1D8CCFC1001C9B81 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };

-               DCD22D9B1D8CCFCB001C9B81 /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
+               DCD22D9B1D8CCFCB001C9B81 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                DCD22D9C1D8CCFD6001C9B81 /* libutilitiesRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */; };
                DCD22D9C1D8CCFD6001C9B81 /* libutilitiesRegressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */; };

+               DCD24DEC228C9A480052604C /* SetValueTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE15E2A222DF63500B7EAA5 /* SetValueTransformer.swift */; };
+               DCD33D7C220B99CC000A390B /* EscrowRequestController.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD33D7A220B985A000A390B /* EscrowRequestController.m */; };
+               DCD33D80220B9DC8000A390B /* OctagonStateMachineHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD33D7E220B9DC8000A390B /* OctagonStateMachineHelpers.h */; };
+               DCD33D81220B9DC8000A390B /* OctagonStateMachineHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD33D7F220B9DC8000A390B /* OctagonStateMachineHelpers.m */; };
+               DCD33D8E220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD33D8C220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.h */; };
+               DCD33D8F220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD33D8D220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.m */; };
+               DCD33D93220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD33D91220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.h */; };
+               DCD33D94220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD33D92220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m */; };

                DCD3EABA1DB599B800DF59BE /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                DCD45355209A5B260086CBFC /* si-cms-signing-identity-p12.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */; };
                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */; };
                DCD4535A209A60DD0086CBFC /* kc-keychain-file-helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD45358209A5C2D0086CBFC /* kc-keychain-file-helpers.c */; };
                DCD3EABA1DB599B800DF59BE /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                DCD45355209A5B260086CBFC /* si-cms-signing-identity-p12.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */; };
                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */; };
                DCD4535A209A60DD0086CBFC /* kc-keychain-file-helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DCD45358209A5C2D0086CBFC /* kc-keychain-file-helpers.c */; };

+               DCD48BFE20BF3D83009A3224 /* tpctl-objc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD48BFD20BF3D83009A3224 /* tpctl-objc.m */; };

                DCD504BC20CB28BE00F37D26 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCD504C220CB28BF00F37D26 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCD504C320CB293700F37D26 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCD662F51E329B6800188186 /* CKKSNewTLKOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */; };
                DCD504BC20CB28BE00F37D26 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCD504C220CB28BF00F37D26 /* SecFramework.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E4F1D8085FC00865A7C /* SecFramework.c */; };
                DCD504C320CB293700F37D26 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCD662F51E329B6800188186 /* CKKSNewTLKOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */; };

-               DCD662F61E329B6800188186 /* CKKSNewTLKOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */; };

                DCD662F71E329B6800188186 /* CKKSNewTLKOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */; };
                DCD662F71E329B6800188186 /* CKKSNewTLKOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */; };

-               DCD662F81E329B6800188186 /* CKKSNewTLKOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */; };

                DCD66DB21D8204F500DB1393 /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */; };
                DCD66DB31D8204FB00DB1393 /* SecServerEncryptionSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */; };
                DCD66DB41D82050000DB1393 /* SecRSAKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E851D8085FC00865A7C /* SecRSAKey.c */; };
                DCD66DB51D82050500DB1393 /* SecECKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E491D8085FC00865A7C /* SecECKey.m */; };
                DCD66DB21D8204F500DB1393 /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */; };
                DCD66DB31D8204FB00DB1393 /* SecServerEncryptionSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */; };
                DCD66DB41D82050000DB1393 /* SecRSAKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E851D8085FC00865A7C /* SecRSAKey.c */; };
                DCD66DB51D82050500DB1393 /* SecECKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E491D8085FC00865A7C /* SecECKey.m */; };

-               DCD66DB61D82050900DB1393 /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.c */; };
+               DCD66DB61D82050900DB1393 /* SecKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E601D8085FC00865A7C /* SecKey.m */; };

                DCD66DB71D82050E00DB1393 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
                DCD66DB91D82051900DB1393 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };
                DCD66DBA1D82052000DB1393 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.c */; };
                DCD66DB71D82050E00DB1393 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E971D8085FC00865A7C /* SecTrustStore.c */; };
                DCD66DB91D82051900DB1393 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E901D8085FC00865A7C /* SecTrust.c */; };
                DCD66DBA1D82052000DB1393 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E7F1D8085FC00865A7C /* SecPolicyLeafCallbacks.c */; };


@@ -4495,10 +5299,10 @@
                DCD66DE31D8205FB00DB1393 /* SecOTRSession.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E751D8085FC00865A7C /* SecOTRSession.c */; };
                DCD66DE41D8205FB00DB1393 /* SecOTRSessionAKE.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E771D8085FC00865A7C /* SecOTRSessionAKE.c */; };
                DCD6C4B21EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD6C4B01EC5302400414FEE /* CKKSNearFutureScheduler.h */; };
                DCD66DE31D8205FB00DB1393 /* SecOTRSession.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E751D8085FC00865A7C /* SecOTRSession.c */; };
                DCD66DE41D8205FB00DB1393 /* SecOTRSessionAKE.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E771D8085FC00865A7C /* SecOTRSessionAKE.c */; };
                DCD6C4B21EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD6C4B01EC5302400414FEE /* CKKSNearFutureScheduler.h */; };

-               DCD6C4B31EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD6C4B01EC5302400414FEE /* CKKSNearFutureScheduler.h */; };

                DCD6C4B41EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */; };
                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 */; };
                DCD6C4B71EC5319600414FEE /* CKKSNearFutureSchedulerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */; };

+               DCD7DD9F22B868F800161396 /* TPPBDispositionDuplicateMachineID.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD7DD9B22B868C100161396 /* TPPBDispositionDuplicateMachineID.m */; };
+               DCD7DDA022B86A5500161396 /* TPPBDispositionDuplicateMachineID.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD7DD9D22B868C200161396 /* TPPBDispositionDuplicateMachineID.h */; settings = {ATTRIBUTES = (Private, ); }; };

                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, ); }; };
                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, ); }; };


@@ -4506,7 +5310,6 @@
                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 */; };
                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 */; };
                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 */; };


@@ -4514,7 +5317,6 @@
                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 */; };
                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 */; };

-               DCD8A1621E09EE0F00E4FA0A /* SOSCloudCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */; };

                DCD8A1631E09EE0F00E4FA0A /* SOSCloudCircleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */; };
                DCD8A1641E09EE0F00E4FA0A /* SOSCloudKeychainClient.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78CF71D8085F200865A7C /* SOSCloudKeychainClient.h */; };
                DCD8A1651E09EE0F00E4FA0A /* SOSCloudKeychainConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78CF91D8085F200865A7C /* SOSCloudKeychainConstants.h */; };
                DCD8A1631E09EE0F00E4FA0A /* SOSCloudCircleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */; };
                DCD8A1641E09EE0F00E4FA0A /* SOSCloudKeychainClient.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78CF71D8085F200865A7C /* SOSCloudKeychainClient.h */; };
                DCD8A1651E09EE0F00E4FA0A /* SOSCloudKeychainConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78CF91D8085F200865A7C /* SOSCloudKeychainConstants.h */; };


@@ -4525,20 +5327,13 @@
                DCD8A16F1E09EE0F00E4FA0A /* SOSKVSKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D731D8085F200865A7C /* SOSKVSKeys.h */; };
                DCD8A1741E09EE0F00E4FA0A /* SOSPeerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D641D8085F200865A7C /* SOSPeerInfo.h */; };
                DCD8A17C1E09EE0F00E4FA0A /* SOSPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D901D8085F200865A7C /* SOSPlatform.h */; };
                DCD8A16F1E09EE0F00E4FA0A /* SOSKVSKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D731D8085F200865A7C /* SOSKVSKeys.h */; };
                DCD8A1741E09EE0F00E4FA0A /* SOSPeerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D641D8085F200865A7C /* SOSPeerInfo.h */; };
                DCD8A17C1E09EE0F00E4FA0A /* SOSPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D901D8085F200865A7C /* SOSPlatform.h */; };

-               DCD8A17D1E09EE0F00E4FA0A /* SOSRing.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D391D8085F200865A7C /* SOSRing.h */; };
-               DCD8A17E1E09EE0F00E4FA0A /* SOSRingBackup.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3B1D8085F200865A7C /* SOSRingBackup.h */; };

                DCD8A17F1E09EE0F00E4FA0A /* SOSKeyedPubKeyIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */; };
                DCD8A1801E09EE0F00E4FA0A /* SOSRingBasic.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3D1D8085F200865A7C /* SOSRingBasic.h */; };
                DCD8A1821E09EE0F00E4FA0A /* SOSAccountGhost.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFAEDC91D999851005187E4 /* SOSAccountGhost.h */; };
                DCD8A17F1E09EE0F00E4FA0A /* SOSKeyedPubKeyIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */; };
                DCD8A1801E09EE0F00E4FA0A /* SOSRingBasic.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3D1D8085F200865A7C /* SOSRingBasic.h */; };
                DCD8A1821E09EE0F00E4FA0A /* SOSAccountGhost.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFAEDC91D999851005187E4 /* SOSAccountGhost.h */; };

-               DCD8A1831E09EE0F00E4FA0A /* SOSRingConcordanceTrust.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D3F1D8085F200865A7C /* SOSRingConcordanceTrust.h */; };
-               DCD8A1841E09EE0F00E4FA0A /* SOSRecoveryKeyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = 48776C741DA5BB4200CC09B9 /* SOSRecoveryKeyBag.h */; };

                DCD8A1851E09EE0F00E4FA0A /* SOSRingDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D411D8085F200865A7C /* SOSRingDER.h */; };
                DCD8A1861E09EE0F00E4FA0A /* SOSRingPeerInfoUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D431D8085F200865A7C /* SOSRingPeerInfoUtils.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 */; };

                DCD8A1891E09EE0F00E4FA0A /* SOSRingUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D471D8085F200865A7C /* SOSRingUtils.h */; };
                DCD8A18A1E09EE0F00E4FA0A /* SOSRingV0.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D491D8085F200865A7C /* SOSRingV0.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 */; };
                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1931E09EE0F00E4FA0A /* SOSTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D8F1D8085F200865A7C /* SOSTypes.h */; };
                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D4B1D8085F200865A7C /* SOSViews.h */; };
                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };


@@ -4551,9 +5346,6 @@
                DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D671D8085F200865A7C /* SOSPeerInfoV2.m */; };
                DCD8A1A61E09EFD700E4FA0A /* SOSKVSKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D721D8085F200865A7C /* SOSKVSKeys.m */; };
                DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D881D8085F200865A7C /* SOSECWrapUnwrap.c */; };
                DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D671D8085F200865A7C /* SOSPeerInfoV2.m */; };
                DCD8A1A61E09EFD700E4FA0A /* SOSKVSKeys.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D721D8085F200865A7C /* SOSKVSKeys.m */; };
                DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D881D8085F200865A7C /* SOSECWrapUnwrap.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 */; };

                DCD8A1B11E09F11900E4FA0A /* SOSPeerInfoDER.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D651D8085F200865A7C /* SOSPeerInfoDER.m */; };
                DCD8A1B21E09F11900E4FA0A /* SOSPeerInfoRingState.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D6D1D8085F200865A7C /* SOSPeerInfoRingState.m */; };
                DCD8A1B31E09F12D00E4FA0A /* SOSCircle.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D2E1D8085F200865A7C /* SOSCircle.c */; };
                DCD8A1B11E09F11900E4FA0A /* SOSPeerInfoDER.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D651D8085F200865A7C /* SOSPeerInfoDER.m */; };
                DCD8A1B21E09F11900E4FA0A /* SOSPeerInfoRingState.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D6D1D8085F200865A7C /* SOSPeerInfoRingState.m */; };
                DCD8A1B31E09F12D00E4FA0A /* SOSCircle.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D2E1D8085F200865A7C /* SOSCircle.c */; };


@@ -4561,15 +5353,8 @@
                DCD8A1B51E09F15400E4FA0A /* SOSGenCount.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D371D8085F200865A7C /* SOSGenCount.c */; };
                DCD8A1B61E09F16C00E4FA0A /* SOSKeyedPubKeyIdentifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 485B64081DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.c */; };
                DCD8A1B71E09F19100E4FA0A /* SOSRingV0.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D481D8085F200865A7C /* SOSRingV0.m */; };
                DCD8A1B51E09F15400E4FA0A /* SOSGenCount.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D371D8085F200865A7C /* SOSGenCount.c */; };
                DCD8A1B61E09F16C00E4FA0A /* SOSKeyedPubKeyIdentifier.c in Sources */ = {isa = PBXBuildFile; fileRef = 485B64081DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.c */; };
                DCD8A1B71E09F19100E4FA0A /* SOSRingV0.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D481D8085F200865A7C /* SOSRingV0.m */; };

-               DCD8A1B81E09F1BB00E4FA0A /* SOSRingBackup.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3A1D8085F200865A7C /* SOSRingBackup.m */; };
-               DCD8A1B91E09F1BB00E4FA0A /* SOSRingBasic.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3C1D8085F200865A7C /* SOSRingBasic.m */; };
-               DCD8A1BA1E09F1BB00E4FA0A /* SOSRingRecovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 48776C7C1DA5BB5F00CC09B9 /* SOSRingRecovery.m */; };
-               DCD8A1BB1E09F1BB00E4FA0A /* SOSRingConcordanceTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D3E1D8085F200865A7C /* SOSRingConcordanceTrust.c */; };

                DCD8A1BC1E09F1BB00E4FA0A /* SOSRingPeerInfoUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D421D8085F200865A7C /* SOSRingPeerInfoUtils.c */; };
                DCD8A1BD1E09F1D600E4FA0A /* SOSFullPeerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D611D8085F200865A7C /* SOSFullPeerInfo.m */; };
                DCD8A1BC1E09F1BB00E4FA0A /* SOSRingPeerInfoUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D421D8085F200865A7C /* SOSRingPeerInfoUtils.c */; };
                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 */; };
-               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 */; };
                DCD8A1DE1E09F74700E4FA0A /* SOSPeerInfoV2.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D681D8085F200865A7C /* SOSPeerInfoV2.h */; };
                DCD8A1DC1E09F5E500E4FA0A /* SOSAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D131D8085F200865A7C /* SOSAccount.h */; };
                DCD8A1DD1E09F73F00E4FA0A /* SOSPeerInfoDER.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D661D8085F200865A7C /* SOSPeerInfoDER.h */; };
                DCD8A1DE1E09F74700E4FA0A /* SOSPeerInfoV2.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D681D8085F200865A7C /* SOSPeerInfoV2.h */; };


@@ -4577,20 +5362,17 @@
                DCD8A1E01E09F76800E4FA0A /* SOSPeerInfoRingState.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D6E1D8085F200865A7C /* SOSPeerInfoRingState.h */; };
                DCD8A1E21E09F78A00E4FA0A /* SOSTransportCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D791D8085F200865A7C /* SOSTransportCircle.h */; };
                DCD8A1E41E09F80B00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1E01E09F76800E4FA0A /* SOSPeerInfoRingState.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D6E1D8085F200865A7C /* SOSPeerInfoRingState.h */; };
                DCD8A1E21E09F78A00E4FA0A /* SOSTransportCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78D791D8085F200865A7C /* SOSTransportCircle.h */; };
                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 */; };

                DCD8A1ED1E09F8B500E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1F01E09F8D100E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1F31E09F91700E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1ED1E09F8B500E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1F01E09F8D100E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
                DCD8A1F31E09F91700E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };

-               DCD8A1F61E09F96900E4FA0A /* 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 */; };
                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 */; };

-               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 */; };
                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 */; };

+               DCDACB5924A3F38E0054080C /* com.apple.security.ckks.plist in Copy Logging Files */ = {isa = PBXBuildFile; fileRef = DCDACB5724A3F1AA0054080C /* com.apple.security.ckks.plist */; };
+               DCDACB5A24A3F39A0054080C /* com.apple.security.ckks.plist in Copy Logging Files */ = {isa = PBXBuildFile; fileRef = DCDACB5724A3F1AA0054080C /* com.apple.security.ckks.plist */; };

                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 */; };
                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 */; };


@@ -4611,7 +5393,7 @@
                DCDCCB391DF25D18006E840E /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; };
                DCDCCB3A1DF25D1D006E840E /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
                DCDCCB3B1DF25D69006E840E /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
                DCDCCB391DF25D18006E840E /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; };
                DCDCCB3A1DF25D1D006E840E /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
                DCDCCB3B1DF25D69006E840E /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA311DEE768000D0F733 /* CloudKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

-               DCDCCB3C1DF25D74006E840E /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
+               DCDCCB3C1DF25D74006E840E /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; settings = {ATTRIBUTES = (Weak, ); }; };

                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 */; };
                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 */; };


@@ -4621,17 +5403,53 @@
                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 */; };
                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 */; };

+               DCDF03122284E34B008055BA /* OctagonTests+EscrowRecovery.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCDF03112284E34B008055BA /* OctagonTests+EscrowRecovery.swift */; };

                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */ = {isa = PBXBuildFile; fileRef = 4CB7405F0A47498100D641BB /* Security.exp-in */; };
                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */ = {isa = PBXBuildFile; fileRef = 4CB7405F0A47498100D641BB /* Security.exp-in */; };

+               DCE0774321ADD635002662FD /* TPPBPeerDynamicInfo.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE7089CB1FA3B19A001ACC20 /* TPPBPeerDynamicInfo.proto */; };
+               DCE0774621ADD638002662FD /* TPPBDisposition.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC3739B20CF2AA200DBDF5B /* TPPBDisposition.proto */; };
+               DCE0774721ADD63A002662FD /* TPPBDispositionEntry.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC373C120D8224A00DBDF5B /* TPPBDispositionEntry.proto */; };
+               DCE0774921ADD63E002662FD /* TPPBPolicyProhibits.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC373A620D810D800DBDF5B /* TPPBPolicyProhibits.proto */; };
+               DCE0774A21ADD640002662FD /* TPPBUnknownMachineID.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC373A720D810D900DBDF5B /* TPPBUnknownMachineID.proto */; };
+               DCE0774B21ADD642002662FD /* TPPBPeerStableInfo.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE7089CC1FA3B332001ACC20 /* TPPBPeerStableInfo.proto */; };
+               DCE0774C21ADD648002662FD /* TPPBPeerPermanentInfo.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE7089DB1FA407E4001ACC20 /* TPPBPeerPermanentInfo.proto */; };
+               DCE0774D21ADD64A002662FD /* TPPBPolicySecret.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE7089D91FA3F0AF001ACC20 /* TPPBPolicySecret.proto */; };
+               DCE0774E21ADD64C002662FD /* TPPBPolicyDocument.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C807D20EAF86100334E33 /* TPPBPolicyDocument.proto */; };
+               DCE0774F21ADD651002662FD /* TPPBPolicyCategoriesByView.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C807F20EAFB9600334E33 /* TPPBPolicyCategoriesByView.proto */; };
+               DCE0775021ADD655002662FD /* TPPBPolicyModelToCategory.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C808020EAFB9600334E33 /* TPPBPolicyModelToCategory.proto */; };
+               DCE0775121ADD658002662FD /* TPPBPolicyIntroducersByCategory.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C808320EAFD7A00334E33 /* TPPBPolicyIntroducersByCategory.proto */; };
+               DCE0775221ADD65A002662FD /* TPPBPolicyRedaction.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6C70D8D520EBDE4500AB6FAF /* TPPBPolicyRedaction.proto */; };
+               DCE0775321ADD65E002662FD /* OTAuthenticatedCiphertext.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582BD218915270040C5F2 /* OTAuthenticatedCiphertext.proto */; };
+               DCE0775421ADD661002662FD /* OTBottle.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582BE218915270040C5F2 /* OTBottle.proto */; };
+               DCE0775521ADD663002662FD /* OTBottleContents.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582BF218915280040C5F2 /* OTBottleContents.proto */; };
+               DCE0775621ADD665002662FD /* OTPrivateKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0CB582BC218915270040C5F2 /* OTPrivateKey.proto */; };
+               DCE0775721ADD669002662FD /* SecDbKeychainSerializedItemV7.proto in Sources */ = {isa = PBXBuildFile; fileRef = 47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */; };
+               DCE0775821ADD66B002662FD /* SecDbKeychainSerializedAKSWrappedKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = 47922D171FAA65120008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.proto */; };
+               DCE0775921ADD66E002662FD /* SecDbKeychainSerializedMetadata.proto in Sources */ = {isa = PBXBuildFile; fileRef = 47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */; };
+               DCE0775A21ADD671002662FD /* SecDbKeychainSerializedSecretData.proto in Sources */ = {isa = PBXBuildFile; fileRef = 47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */; };
+               DCE0775E21ADD71C002662FD /* TPPBDispositionEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC373C920D822CD00DBDF5B /* TPPBDispositionEntry.m */; };
+               DCE0776021ADD71C002662FD /* TPPBAncientEpoch.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC373AD20D815E100DBDF5B /* TPPBAncientEpoch.m */; };
+               DCE0776221ADD71C002662FD /* TPPBPolicyProhibits.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC373AE20D815E200DBDF5B /* TPPBPolicyProhibits.m */; };
+               DCE0776421ADD71C002662FD /* TPPBUnknownMachineID.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC373AC20D815E000DBDF5B /* TPPBUnknownMachineID.m */; };
+               DCE0776621ADD71C002662FD /* TPPBDisposition.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC373A320CF3B5C00DBDF5B /* TPPBDisposition.m */; };
+               DCE0776821ADD71C002662FD /* TPPBPeerPermanentInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7089DE1FA40B95001ACC20 /* TPPBPeerPermanentInfo.m */; };
+               DCE0776A21ADD71C002662FD /* TPPBPeerDynamicInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7089D21FA3BA03001ACC20 /* TPPBPeerDynamicInfo.m */; };
+               DCE0776C21ADD71C002662FD /* TPPBPolicySecret.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7089D01FA3BA01001ACC20 /* TPPBPolicySecret.m */; };
+               DCE0776E21ADD71C002662FD /* TPPBPeerStableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = BE7089D11FA3BA02001ACC20 /* TPPBPeerStableInfo.m */; };
+               DCE0777021ADD71C002662FD /* TPPBVoucher.m in Sources */ = {isa = PBXBuildFile; fileRef = BE70899B1F9AAFF7001ACC20 /* TPPBVoucher.m */; };
+               DCE0777221ADD71C002662FD /* TPPBPolicyDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C807520EAF81900334E33 /* TPPBPolicyDocument.m */; };
+               DCE0777421ADD71C002662FD /* TPPBPolicyCategoriesByView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C70D8D420EB02B700AB6FAF /* TPPBPolicyCategoriesByView.m */; };
+               DCE0777621ADD71C002662FD /* TPPBPolicyIntroducersByCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C809520EB024800334E33 /* TPPBPolicyIntroducersByCategory.m */; };
+               DCE0777821ADD71C002662FD /* TPPBPolicyModelToCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C0C809920EB024900334E33 /* TPPBPolicyModelToCategory.m */; };
+               DCE0777A21ADD71C002662FD /* TPPBPolicyRedaction.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C70D8DD20EBDFD600AB6FAF /* TPPBPolicyRedaction.m */; };
+               DCE0777F21ADEC07002662FD /* OTAccountMetadataClassC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C89BDA021554DD2003F3CC0 /* OTAccountMetadataClassC.m */; };
+               DCE0778021ADEC4B002662FD /* CKKSSerializedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */; };

                DCE2341720A3D4B8009766A3 /* si-cms-hash-agility-data.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */; };
                DCE2341820A3D4B8009766A3 /* si-cms-hash-agility-data.c in Sources */ = {isa = PBXBuildFile; fileRef = DCE2341620A3D4B8009766A3 /* si-cms-hash-agility-data.c */; };
                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };
                DCE2341720A3D4B8009766A3 /* si-cms-hash-agility-data.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */; };
                DCE2341820A3D4B8009766A3 /* si-cms-hash-agility-data.c in Sources */ = {isa = PBXBuildFile; fileRef = DCE2341620A3D4B8009766A3 /* si-cms-hash-agility-data.c */; };
                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };

-               DCE278DE1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */; };

                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */; };
                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */; };

-               DCE278E01ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */; };

                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */; };
                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */; };

-               DCE278E91ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */; };

                DCE278EA1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */; };
                DCE278EA1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */; };

-               DCE278EB1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */; };
+               DCE405C523A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE405C423A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift */; };

                DCE4E6921D7A37FA00AFB96E /* security_tool_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = E7104A0B169E171900DB0045 /* security_tool_commands.c */; };
                DCE4E6931D7A37FA00AFB96E /* NSFileHandle+Formatting.m in Sources */ = {isa = PBXBuildFile; fileRef = E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */; };
                DCE4E6961D7A37FA00AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DCE4E6921D7A37FA00AFB96E /* security_tool_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = E7104A0B169E171900DB0045 /* security_tool_commands.c */; };
                DCE4E6931D7A37FA00AFB96E /* NSFileHandle+Formatting.m in Sources */ = {isa = PBXBuildFile; fileRef = E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */; };
                DCE4E6961D7A37FA00AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };


@@ -4648,9 +5466,6 @@
                DCE4E75E1D7A43B500AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DCE4E7681D7A43B500AFB96E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };
                DCE4E75E1D7A43B500AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                DCE4E7681D7A43B500AFB96E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886E81CEBDD2A00DC7583 /* nist-certs */; };

-               DCE4E76E1D7A43B500AFB96E /* ssl-policy-certs in Resources */ = {isa = PBXBuildFile; fileRef = D4D886BE1CEB9F3B00DC7583 /* ssl-policy-certs */; };
-               DCE4E76F1D7A43B500AFB96E /* si-20-sectrust-policies-data in Resources */ = {isa = PBXBuildFile; fileRef = D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */; };
-               DCE4E7701D7A43B500AFB96E /* si-82-sectrust-ct-data in Resources */ = {isa = PBXBuildFile; fileRef = 0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */; };

                DCE4E7721D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFD1410671D00EE92DE /* Invalid-asterisk.google.com.crt */; };
                DCE4E7731D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFE1410671D00EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt */; };
                DCE4E7741D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFF1410671D00EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt */; };
                DCE4E7721D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFD1410671D00EE92DE /* Invalid-asterisk.google.com.crt */; };
                DCE4E7731D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFE1410671D00EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt */; };
                DCE4E7741D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */ = {isa = PBXBuildFile; fileRef = 4C50ACFF1410671D00EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt */; };


@@ -4707,18 +5522,13 @@
                DCE4E7AA1D7A43B500AFB96E /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */; };
                DCE4E7AB1D7A43B500AFB96E /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };
                DCE4E7AC1D7A43B500AFB96E /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */; };
                DCE4E7AA1D7A43B500AFB96E /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */; };
                DCE4E7AB1D7A43B500AFB96E /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */; };
                DCE4E7AC1D7A43B500AFB96E /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */ = {isa = PBXBuildFile; fileRef = 794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */; };

-               DCE4E7B41D7A43DC00AFB96E /* si-82-sectrust-ct-logs.plist in Resources */ = {isa = PBXBuildFile; fileRef = DCE4E72E1D7A436300AFB96E /* si-82-sectrust-ct-logs.plist */; };

                DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E6D71D7A420D00AFB96E /* main.m */; };
                DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E6D71D7A420D00AFB96E /* main.m */; };

-               DCE4E7B61D7A440A00AFB96E /* bc-10-knife-on-bread.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E6D41D7A41E400AFB96E /* bc-10-knife-on-bread.m */; };

                DCE4E7BF1D7A463400AFB96E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCE4E7C11D7A463E00AFB96E /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
                DCE4E7BF1D7A463400AFB96E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCE4E7C11D7A463E00AFB96E /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };

-               DCE4E7C41D7A465500AFB96E /* libsecurity_smime_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17844B1D77869A00B50D50 /* libsecurity_smime_regressions.a */; };

                DCE4E7C61D7A468300AFB96E /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB2CA4D81D2C28C800AB770F /* libaks.a */; };
                DCE4E7C61D7A468300AFB96E /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB2CA4D81D2C28C800AB770F /* libaks.a */; };

-               DCE4E7DF1D7A4B4C00AFB96E /* bc-10-knife-on-bread.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E6D41D7A41E400AFB96E /* bc-10-knife-on-bread.m */; };

                DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E7E11D7A4B7F00AFB96E /* main.c */; };
                DCE4E7E41D7A4B8F00AFB96E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };
                DCE4E7E71D7A4B9C00AFB96E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789261D7799D300B50D50 /* IOKit.framework */; };
                DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E7E11D7A4B7F00AFB96E /* main.c */; };
                DCE4E7E41D7A4B8F00AFB96E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };
                DCE4E7E71D7A4B9C00AFB96E /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789261D7799D300B50D50 /* IOKit.framework */; };

-               DCE4E7E81D7A4BA400AFB96E /* libsecurity_smime_regressions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17844B1D77869A00B50D50 /* libsecurity_smime_regressions.a */; };

                DCE4E7EA1D7A4BAE00AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DCE4E7EB1D7A4BB200AFB96E /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E6E71D7A427200AFB96E /* SecurityFoundation.framework */; };
                DCE4E7EC1D7A4BB800AFB96E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCE4E7EA1D7A4BAE00AFB96E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789241D7799CD00B50D50 /* CoreFoundation.framework */; };
                DCE4E7EB1D7A4BB200AFB96E /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E6E71D7A427200AFB96E /* SecurityFoundation.framework */; };
                DCE4E7EC1D7A4BB800AFB96E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };


@@ -4795,22 +5605,16 @@
                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 */; };
                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 */; };
                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 */; };
+               DCE772662290712F005862B4 /* OctagonCheckTrustStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCE772642290712F005862B4 /* OctagonCheckTrustStateOperation.h */; };
+               DCE772672290712F005862B4 /* OctagonCheckTrustStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE772652290712F005862B4 /* OctagonCheckTrustStateOperation.m */; };
+               DCE7F2091F21726500DDB0F7 /* OctagonAPSReceiverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE7F2081F21726500DDB0F7 /* OctagonAPSReceiverTests.m */; };
+               DCE809F31D9342BE00F91177 /* com.apple.securityd.plist in launchd plist */ = {isa = PBXBuildFile; fileRef = DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */; };

                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */; };
                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */; };

-               DCEA5D561E2826DB0089CF55 /* CKKSSIV.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */; };

                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };

-               DCEA5D581E2826DB0089CF55 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
-               DCEA5D851E2F14810089CF55 /* CKKSAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* CKKSAPSReceiver.h */; };
-               DCEA5D861E2F14810089CF55 /* CKKSAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* CKKSAPSReceiver.h */; };
-               DCEA5D871E2F14810089CF55 /* CKKSAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* CKKSAPSReceiver.m */; };
-               DCEA5D881E2F14810089CF55 /* CKKSAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* CKKSAPSReceiver.m */; };
-               DCEA5D971E3015830089CF55 /* CKKSZone.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D961E3014250089CF55 /* CKKSZone.m */; };
-               DCEA5D981E3015840089CF55 /* CKKSZone.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D961E3014250089CF55 /* CKKSZone.m */; };
+               DCEA5D851E2F14810089CF55 /* OctagonAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */; };
+               DCEA5D871E2F14810089CF55 /* OctagonAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */; };

                DCEDE3511D80B0FA00C3826E /* secd-71-engine-save-sample1.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C651D8085D800865A7C /* secd-71-engine-save-sample1.h */; };
                DCEDE3901D80B10100C3826E /* SecOTRIdentityPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF615AFB73800B9D400 /* SecOTRIdentityPriv.h */; };
                DCEDE3911D80B10800C3826E /* SecCTKKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E451D8085FC00865A7C /* SecCTKKeyPriv.h */; };
                DCEDE3511D80B0FA00C3826E /* secd-71-engine-save-sample1.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C651D8085D800865A7C /* secd-71-engine-save-sample1.h */; };
                DCEDE3901D80B10100C3826E /* SecOTRIdentityPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF7FFF615AFB73800B9D400 /* SecOTRIdentityPriv.h */; };
                DCEDE3911D80B10800C3826E /* SecCTKKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78E451D8085FC00865A7C /* SecCTKKeyPriv.h */; };


@@ -4819,6 +5623,27 @@
                DCEDE3941D80B11800C3826E /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.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 */; };
                DCEDE3941D80B11800C3826E /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.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 */; };

+               DCF12673218A757A000124C6 /* OTLeaveCliqueOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF12671218A7579000124C6 /* OTLeaveCliqueOperation.h */; };
+               DCF12674218A757A000124C6 /* OTLeaveCliqueOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF12672218A757A000124C6 /* OTLeaveCliqueOperation.m */; };
+               DCF216DE21ADD5F90029CCC1 /* CKKSSerializedKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */; };
+               DCF216DF21ADD5FB0029CCC1 /* OTPairingMessage.proto in Sources */ = {isa = PBXBuildFile; fileRef = 0C0F76DD21399AF40074EDDF /* OTPairingMessage.proto */; };
+               DCF216E021ADD5FD0029CCC1 /* OTAccountMetadataClassC.proto in Sources */ = {isa = PBXBuildFile; fileRef = DC751A0C211E02B100C18042 /* OTAccountMetadataClassC.proto */; };
+               DCF216E121ADD6060029CCC1 /* TPPBVoucher.proto in Sources */ = {isa = PBXBuildFile; fileRef = BE7089911F9AA027001ACC20 /* TPPBVoucher.proto */; };
+               DCF458B3221F6964007F5507 /* TPLog.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF458AE221F6890007F5507 /* TPLog.m */; };
+               DCF458B4221F6A90007F5507 /* TPLog.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF458AD221F6890007F5507 /* TPLog.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               DCF46570220110C900BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF46571220110E100BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF46572220114E400BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF46573220114F000BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF465742201155000BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF46575220115E300BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF465762201162800BA6EEA /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               DCF4657A22011E1400BA6EEA /* EscrowRequestCLI.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF4657922011E1300BA6EEA /* EscrowRequestCLI.m */; };
+               DCF46C2E214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF46C2C214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h */; };
+               DCF46C30214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF46C2D214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m */; };
+               DCF6320521C074F30030CCC0 /* CuttlefishAPIHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */; };
+               DCF6320721C075210030CCC0 /* CuttlefishAPIHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */; };
+               DCF6320821C09DCE0030CCC0 /* CuttlefishAPIHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */; };

                DCF7839D1D88B60D00E694BB /* aesCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783151D88B60D00E694BB /* aesCommon.h */; };
                DCF7839E1D88B60D00E694BB /* aescsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783161D88B60D00E694BB /* aescsp.cpp */; };
                DCF7839F1D88B60D00E694BB /* aescspi.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783171D88B60D00E694BB /* aescspi.h */; };
                DCF7839D1D88B60D00E694BB /* aesCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783151D88B60D00E694BB /* aesCommon.h */; };
                DCF7839E1D88B60D00E694BB /* aescsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783161D88B60D00E694BB /* aescsp.cpp */; };
                DCF7839F1D88B60D00E694BB /* aescspi.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783171D88B60D00E694BB /* aescspi.h */; };


@@ -4858,18 +5683,6 @@
                DCF783C21D88B60D00E694BB /* wrapKeyCms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7833B1D88B60D00E694BB /* wrapKeyCms.cpp */; };
                DCF783C31D88B60D00E694BB /* YarrowConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7833C1D88B60D00E694BB /* YarrowConnection.cpp */; };
                DCF783C41D88B60D00E694BB /* YarrowConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7833D1D88B60D00E694BB /* YarrowConnection.h */; };
                DCF783C21D88B60D00E694BB /* wrapKeyCms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7833B1D88B60D00E694BB /* wrapKeyCms.cpp */; };
                DCF783C31D88B60D00E694BB /* YarrowConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7833C1D88B60D00E694BB /* YarrowConnection.cpp */; };
                DCF783C41D88B60D00E694BB /* YarrowConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7833D1D88B60D00E694BB /* YarrowConnection.h */; };

-               DCF783C51D88B60D00E694BB /* algmaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7833F1D88B60D00E694BB /* algmaker.cpp */; };
-               DCF783C61D88B60D00E694BB /* bsafeAsymmetric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783401D88B60D00E694BB /* bsafeAsymmetric.cpp */; };
-               DCF783C71D88B60D00E694BB /* bsafeContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783411D88B60D00E694BB /* bsafeContext.cpp */; };
-               DCF783C81D88B60D00E694BB /* bsafecsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783421D88B60D00E694BB /* bsafecsp.h */; };
-               DCF783C91D88B60D00E694BB /* bsafecspi.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783431D88B60D00E694BB /* bsafecspi.h */; };
-               DCF783CA1D88B60D00E694BB /* bsafeKeyGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783441D88B60D00E694BB /* bsafeKeyGen.cpp */; };
-               DCF783CB1D88B60D00E694BB /* bsafePKCS1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783451D88B60D00E694BB /* bsafePKCS1.cpp */; };
-               DCF783CC1D88B60D00E694BB /* bsafePKCS1.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783461D88B60D00E694BB /* bsafePKCS1.h */; };
-               DCF783CD1D88B60D00E694BB /* bsafeSymmetric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783471D88B60D00E694BB /* bsafeSymmetric.cpp */; };
-               DCF783CE1D88B60D00E694BB /* bsobjects.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF783481D88B60D00E694BB /* bsobjects.h */; };
-               DCF783CF1D88B60D00E694BB /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF783491D88B60D00E694BB /* memory.cpp */; };
-               DCF783D01D88B60D00E694BB /* miscalgorithms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7834A1D88B60D00E694BB /* miscalgorithms.cpp */; };

                DCF783D11D88B60D00E694BB /* ascContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7834C1D88B60D00E694BB /* ascContext.cpp */; };
                DCF783D21D88B60D00E694BB /* ascContext.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7834D1D88B60D00E694BB /* ascContext.h */; };
                DCF783D31D88B60D00E694BB /* ascFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7834E1D88B60D00E694BB /* ascFactory.h */; };
                DCF783D11D88B60D00E694BB /* ascContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF7834C1D88B60D00E694BB /* ascContext.cpp */; };
                DCF783D21D88B60D00E694BB /* ascContext.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7834D1D88B60D00E694BB /* ascContext.h */; };
                DCF783D31D88B60D00E694BB /* ascFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7834E1D88B60D00E694BB /* ascFactory.h */; };


@@ -5131,31 +5944,38 @@
                DCF789441D88CD6700E694BB /* tpTime.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF788FA1D88CD4200E694BB /* tpTime.h */; };
                DCF789481D88D17C00E694BB /* AppleX509TPBuiltin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DCF789471D88D17C00E694BB /* AppleX509TPBuiltin.cpp */; };
                DCF7A8A01F04502400CABE89 /* CKKSControlProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */; };
                DCF789441D88CD6700E694BB /* tpTime.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF788FA1D88CD4200E694BB /* tpTime.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 */; };
+               DCF94A7B222D9F2400C01744 /* OctagonCKKSPeerAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF94A79222D9F2400C01744 /* OctagonCKKSPeerAdapter.h */; };
+               DCF94A7C222D9F2400C01744 /* OctagonCKKSPeerAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF94A7A222D9F2400C01744 /* OctagonCKKSPeerAdapter.m */; };

                DCFABF8E20081E2F001128B5 /* CKKSDeviceStateUploadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */; };
                DCFAEDCF1D999859005187E4 /* SOSAccountGhost.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFAEDC81D999851005187E4 /* SOSAccountGhost.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 */; };
                DCFAEDD71D99A4AB005187E4 /* secd-154-engine-backoff.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */; };
                DCFAEDD61D99A47A005187E4 /* secd-36-ks-encrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */; };
                DCFAEDD71D99A4AB005187E4 /* secd-154-engine-backoff.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */; };

-               DCFB12C51E95A4C000510F5F /* CKKSCKAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSCKAccountStateTracker.h */; };
-               DCFB12C61E95A4C000510F5F /* CKKSCKAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSCKAccountStateTracker.h */; };
-               DCFB12C71E95A4C000510F5F /* CKKSCKAccountStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB12C41E95A4C000510F5F /* CKKSCKAccountStateTracker.m */; };
-               DCFB12C81E95A4C000510F5F /* CKKSCKAccountStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB12C41E95A4C000510F5F /* CKKSCKAccountStateTracker.m */; };
+               DCFB12C51E95A4C000510F5F /* CKKSAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */; };
+               DCFB12C71E95A4C000510F5F /* CKKSAccountStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFB12C41E95A4C000510F5F /* CKKSAccountStateTracker.m */; };
+               DCFC91AF21F16E0B00E674DD /* OctagonStateMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFC91AD21F16E0B00E674DD /* OctagonStateMachine.h */; };
+               DCFC91B021F16E0B00E674DD /* OctagonStateMachine.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFC91AE21F16E0B00E674DD /* OctagonStateMachine.m */; };

                DCFE1C271F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */; };
                DCFE1C271F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */; };

-               DCFE1C281F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */; };

                DCFE1C291F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */; };
                DCFE1C291F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */; };

-               DCFE1C2A1F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */; };

                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */; };
                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */; };

-               DCFE1C351F17ECE5007640C8 /* CKKSCondition.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */; };

                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };
                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };

-               DCFE1C371F17ECE5007640C8 /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };

                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */; };
                DCFE1C511F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */; };
                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */; };
                DCFE1C511F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */; };

-               DCFE1C521F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */; };

                DCFE1C531F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */; };
                DCFE1C531F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */; };

-               DCFE1C541F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */; };

                DCFE9C8920EC1F3B00EB6BAC /* SOSControlHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCFE9C8F20EC1F3C00EB6BAC /* SOSControlHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCFE9C8920EC1F3B00EB6BAC /* SOSControlHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };
                DCFE9C8F20EC1F3C00EB6BAC /* SOSControlHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEEE351EA31A8300E15F5C /* SOSControlHelper.h */; settings = {ATTRIBUTES = (Private, ); }; };

+               DCFF82712162834D00D54B02 /* OctagonTestsXPCConnections.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCFF82702162834C00D54B02 /* OctagonTestsXPCConnections.swift */; };
+               DCFF82742162876400D54B02 /* OTResetOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFF82722162876400D54B02 /* OTResetOperation.h */; };
+               DCFF82762162876400D54B02 /* OTResetOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFF82732162876400D54B02 /* OTResetOperation.m */; };
+               DCFFE9692277DEAF0092069C /* TrustedPeersHelperProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DC754C712228B57B00A39C8E /* TrustedPeersHelperProtocol.m */; };
+               DCFFE96D2277E0E90092069C /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               E060D1A9212478100025B833 /* OctagonTestHarnessXPCServiceProtocol.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E060D1A72124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+               E060D1B8212478120025B833 /* OctagonTestHarnessXPCService.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = E060D1B7212478110025B833 /* OctagonTestHarnessXPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+               E060D1BF212478120025B833 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E060D1BE212478120025B833 /* main.m */; };
+               E060D1C7212478120025B833 /* OctagonTestHarness.h in Headers */ = {isa = PBXBuildFile; fileRef = E060D19E2124780F0025B833 /* OctagonTestHarness.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               E060D24721247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = E060D24221247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.m */; };
+               E060D24821247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E060D24421247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.h */; };
+               E09E09EB215506650042C7D3 /* OctagonTestHarnessXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = E09E09E9215506570042C7D3 /* OctagonTestHarnessXPCService.m */; };
+               E291657F2048BCCB0046512B /* TPPBPeerStableInfoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E291657E2048BCCB0046512B /* TPPBPeerStableInfoTests.m */; };

                E7104A0C169E171900DB0045 /* security_tool_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = E7104A0B169E171900DB0045 /* security_tool_commands.c */; };
                E71454EF1C741E0800B5B20B /* KCError.h in Headers */ = {isa = PBXBuildFile; fileRef = E71454ED1C741E0800B5B20B /* KCError.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E71454F01C741E0800B5B20B /* KCError.m in Sources */ = {isa = PBXBuildFile; fileRef = E71454EE1C741E0800B5B20B /* KCError.m */; };
                E7104A0C169E171900DB0045 /* security_tool_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = E7104A0B169E171900DB0045 /* security_tool_commands.c */; };
                E71454EF1C741E0800B5B20B /* KCError.h in Headers */ = {isa = PBXBuildFile; fileRef = E71454ED1C741E0800B5B20B /* KCError.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E71454F01C741E0800B5B20B /* KCError.m in Sources */ = {isa = PBXBuildFile; fileRef = E71454EE1C741E0800B5B20B /* KCError.m */; };


@@ -5172,7 +5992,6 @@
                E75C0E821C6FC31D00E6953B /* KCSRPContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E75C0E801C6FC31D00E6953B /* KCSRPContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E75C0E831C6FC31D00E6953B /* KCSRPContext.m in Sources */ = {isa = PBXBuildFile; fileRef = E75C0E811C6FC31D00E6953B /* KCSRPContext.m */; };
                E75C0E851C71329900E6953B /* KeychainCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = E75C0E841C71325000E6953B /* KeychainCircle.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E75C0E821C6FC31D00E6953B /* KCSRPContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E75C0E801C6FC31D00E6953B /* KCSRPContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E75C0E831C6FC31D00E6953B /* KCSRPContext.m in Sources */ = {isa = PBXBuildFile; fileRef = E75C0E811C6FC31D00E6953B /* KCSRPContext.m */; };
                E75C0E851C71329900E6953B /* KeychainCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = E75C0E841C71325000E6953B /* KeychainCircle.h */; settings = {ATTRIBUTES = (Public, ); }; };

-               E7650E6F1C7699DA00378669 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };

                E76638A81DD679BC00B769D3 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                E7676DB619411DF300498DD4 /* SecServerEncryptionSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E772FD471CC15EFA00D63E41 /* NSData+SecRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = E772FD461CC15EFA00D63E41 /* NSData+SecRandom.m */; };
                E76638A81DD679BC00B769D3 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                E7676DB619411DF300498DD4 /* SecServerEncryptionSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E772FD471CC15EFA00D63E41 /* NSData+SecRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = E772FD461CC15EFA00D63E41 /* NSData+SecRandom.m */; };


@@ -5205,34 +6024,36 @@
                E7D690A11652E07B0079537A /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                E7D848051C6BEFCD0025BB44 /* KCSRPTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7D848041C6BEFC10025BB44 /* KCSRPTests.m */; };
                E7D848561C6C1E830025BB44 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };
                E7D690A11652E07B0079537A /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D690911652E06A0079537A /* libMobileGestalt.dylib */; };
                E7D848051C6BEFCD0025BB44 /* KCSRPTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7D848041C6BEFC10025BB44 /* KCSRPTests.m */; };
                E7D848561C6C1E830025BB44 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };

-               E7D8489F1C6C244B0025BB44 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D848541C6C1D9C0025BB44 /* Foundation.framework */; };

                E7DC73B71C890F0E0008BF73 /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D847C51C6BE9710025BB44 /* KeychainCircle.framework */; };
                E7E3EFBA1CBC192A00E79A5D /* KCAccountKCCircleDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E7E3EFB91CBC192A00E79A5D /* KCAccountKCCircleDelegate.m */; };
                E7E3EFE31CBC195700E79A5D /* KCAccountKCCircleDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E7E3EFE21CBC195700E79A5D /* KCAccountKCCircleDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7EBDEBC1C87C0DB001BAA62 /* KeychainCircle.plist in Install BATS Tests */ = {isa = PBXBuildFile; fileRef = E7CFF7221C8660A000E3484E /* KeychainCircle.plist */; };
                E7F480121C729C7B00390FDB /* NSError+KCCreationHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480111C729C7B00390FDB /* NSError+KCCreationHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E7DC73B71C890F0E0008BF73 /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D847C51C6BE9710025BB44 /* KeychainCircle.framework */; };
                E7E3EFBA1CBC192A00E79A5D /* KCAccountKCCircleDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E7E3EFB91CBC192A00E79A5D /* KCAccountKCCircleDelegate.m */; };
                E7E3EFE31CBC195700E79A5D /* KCAccountKCCircleDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E7E3EFE21CBC195700E79A5D /* KCAccountKCCircleDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7EBDEBC1C87C0DB001BAA62 /* KeychainCircle.plist in Install BATS Tests */ = {isa = PBXBuildFile; fileRef = E7CFF7221C8660A000E3484E /* KeychainCircle.plist */; };
                E7F480121C729C7B00390FDB /* NSError+KCCreationHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480111C729C7B00390FDB /* NSError+KCCreationHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               E7F480151C73980D00390FDB /* KCJoiningRequestSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F480141C73980D00390FDB /* KCJoiningRequestSession.m */; };
+               E7F480151C73980D00390FDB /* KCJoiningRequestSecretSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F480141C73980D00390FDB /* KCJoiningRequestSecretSession.m */; };

                E7F480321C73FC4C00390FDB /* KCAESGCMDuplexSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480301C73FC4C00390FDB /* KCAESGCMDuplexSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7F480331C73FC4C00390FDB /* KCAESGCMDuplexSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F480311C73FC4C00390FDB /* KCAESGCMDuplexSession.m */; };
                E7F4809C1C74E85200390FDB /* KCDerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F4809B1C74E85200390FDB /* KCDerTest.m */; };
                E7F4809E1C74E86D00390FDB /* KCAESGCMTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F4809D1C74E86D00390FDB /* KCAESGCMTest.m */; };
                E7F480321C73FC4C00390FDB /* KCAESGCMDuplexSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480301C73FC4C00390FDB /* KCAESGCMDuplexSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7F480331C73FC4C00390FDB /* KCAESGCMDuplexSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F480311C73FC4C00390FDB /* KCAESGCMDuplexSession.m */; };
                E7F4809C1C74E85200390FDB /* KCDerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F4809B1C74E85200390FDB /* KCDerTest.m */; };
                E7F4809E1C74E86D00390FDB /* KCAESGCMTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F4809D1C74E86D00390FDB /* KCAESGCMTest.m */; };

-               E7F482701C74FDD100390FDB /* KCJoiningSessionTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F4826F1C74FDD100390FDB /* KCJoiningSessionTest.m */; };

                E7F482961C74FDF800390FDB /* KCJoiningSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480131C7397CE00390FDB /* KCJoiningSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F482A21C7544E600390FDB /* libctkclient_test.a */; };
                E7F482961C74FDF800390FDB /* KCJoiningSession.h in Headers */ = {isa = PBXBuildFile; fileRef = E7F480131C7397CE00390FDB /* KCJoiningSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F482A21C7544E600390FDB /* libctkclient_test.a */; };

-               E7F482A61C75453900390FDB /* libcoreauthd_test_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F482A51C75453900390FDB /* libcoreauthd_test_client.a */; };

                E7F482AA1C7554FB00390FDB /* NSError+KCCreationHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F482A91C7554F500390FDB /* NSError+KCCreationHelpers.m */; };
                E7F482AC1C7558F700390FDB /* KCJoiningAcceptSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */; };
                E7F482E61C7640D300390FDB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                E7FEEEF81332B7F70025EB06 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                E7FEEEFA1332B8210025EB06 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                E7FEEEFB1332B8300025EB06 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                E7F482AA1C7554FB00390FDB /* NSError+KCCreationHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F482A91C7554F500390FDB /* NSError+KCCreationHelpers.m */; };
                E7F482AC1C7558F700390FDB /* KCJoiningAcceptSession.m in Sources */ = {isa = PBXBuildFile; fileRef = E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */; };
                E7F482E61C7640D300390FDB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                E7FEEEF81332B7F70025EB06 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                E7FEEEFA1332B8210025EB06 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                E7FEEEFB1332B8300025EB06 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };

-               EB056E431FE5E390000A771E /* DeviceSimulator.m in Sources */ = {isa = PBXBuildFile; fileRef = EB056E421FE5E390000A771E /* DeviceSimulator.m */; };
-               EB056E451FE5E390000A771E /* DeviceSimulatorMain.m in Sources */ = {isa = PBXBuildFile; fileRef = EB056E441FE5E390000A771E /* DeviceSimulatorMain.m */; };
-               EB05C4F41FE5E48B00D68712 /* MultiDeviceSimulatorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB05C4F31FE5E48B00D68712 /* MultiDeviceSimulatorTests.m */; };
+               EB09310D213F980800C0A495 /* TestResourceUsage.m in Sources */ = {isa = PBXBuildFile; fileRef = EB093107213F8EC100C0A495 /* TestResourceUsage.m */; };

                EB0BC93A1C3C791500785842 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EB0BC9671C3C798600785842 /* secedumodetest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0BC9661C3C794700785842 /* secedumodetest.m */; };
                EB0DB37D1DCBC99100EAB6AE /* Keychain Circle Notification.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = EB76B75A1DCB0CDA00C43FBC /* Keychain Circle Notification.8 */; };
                EB0BC93A1C3C791500785842 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EB0BC9671C3C798600785842 /* secedumodetest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0BC9661C3C794700785842 /* secedumodetest.m */; };
                EB0DB37D1DCBC99100EAB6AE /* Keychain Circle Notification.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = EB76B75A1DCB0CDA00C43FBC /* Keychain Circle Notification.8 */; };

+               EB0E1ACB2353A702002B6037 /* CKKSPBFileStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = EB973650234E8F4B00518B2B /* CKKSPBFileStorage.m */; };
+               EB0E1ACD2353A704002B6037 /* CKKSRateLimiter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */; };
+               EB0E1ACE2353A704002B6037 /* CKKSPBFileStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = EB973650234E8F4B00518B2B /* CKKSPBFileStorage.m */; };
+               EB0E1ADA2357627F002B6037 /* CKKSPBFileStorageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0E1AD723576273002B6037 /* CKKSPBFileStorageTests.m */; };
+               EB0E1B912358FAC6002B6037 /* SOSAccountConfiguration.proto in Sources */ = {isa = PBXBuildFile; fileRef = EB0E1AC72352A81E002B6037 /* SOSAccountConfiguration.proto */; };
+               EB0E1B942358FAF3002B6037 /* SOSAccountConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = EB0E1B932358FADE002B6037 /* SOSAccountConfiguration.m */; };
+               EB0F4A2C22F7D3DC009E855B /* OCMock.framework in Embedd OCMock */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };

                EB1055791E14DF570003C309 /* SecCertificateFuzzer.c in Sources */ = {isa = PBXBuildFile; fileRef = EB10556B1E14DC0F0003C309 /* SecCertificateFuzzer.c */; };
                EB1055831E14E1F90003C309 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */; };
                EB1055841E14E1F90003C309 /* Invalid-www.cybersecurity.my.crt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */; };
                EB1055791E14DF570003C309 /* SecCertificateFuzzer.c in Sources */ = {isa = PBXBuildFile; fileRef = EB10556B1E14DC0F0003C309 /* SecCertificateFuzzer.c */; };
                EB1055831E14E1F90003C309 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */; };
                EB1055841E14E1F90003C309 /* Invalid-www.cybersecurity.my.crt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */; };


@@ -5265,18 +6086,28 @@
                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 */; };
                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, ); }; };
                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, ); }; };

+               EB18A7BA2238C07600A0FC41 /* OTDeviceInformationAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = DC19484B21812EC5007C2260 /* OTDeviceInformationAdapter.m */; };
+               EB1C319D2215ED3500A188BB /* otctl.1 in Install man1 pages */ = {isa = PBXBuildFile; fileRef = EB1C319C2215EC9600A188BB /* otctl.1 */; };
+               EB1E069D211E16260088F0B1 /* mockaksxcbase.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0695211E137E0088F0B1 /* mockaksxcbase.m */; };
+               EB1E069F211E17C00088F0B1 /* mockaksWatchDog.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E069E211E17B70088F0B1 /* mockaksWatchDog.m */; };

                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 */; };
                EB2CA5571D2C36D400AB770F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                EB2D54AB1F02A47200E46890 /* SecAtomicFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB2D54A01F02A28200E46890 /* SecAtomicFile.cpp */; };
                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 */; };
                EB2CA5571D2C36D400AB770F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                EB2D54AB1F02A47200E46890 /* SecAtomicFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB2D54A01F02A28200E46890 /* SecAtomicFile.cpp */; };

+               EB3210C720F532CD003504F7 /* SOSAccountTrustClassic+Identity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE7604B1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m */; };
+               EB3210CD20F532F3003504F7 /* SOSAccountTrustClassic+Retirement.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE7604D1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m */; };

                EB3409B01C1D627400D77661 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EB3409B01C1D627400D77661 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

+               EB351540211A79E30097A87C /* secd-33-keychain-backup.m in Sources */ = {isa = PBXBuildFile; fileRef = EB35153F211A79CB0097A87C /* secd-33-keychain-backup.m */; };

                EB3A8DFF1BEEC66F001A89AA /* Security_edumode.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */; };
                EB3D1FBA2092CB030049EF95 /* SecurityInduceLowDisk.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */; };
                EB3A8DFF1BEEC66F001A89AA /* Security_edumode.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */; };
                EB3D1FBA2092CB030049EF95 /* SecurityInduceLowDisk.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */; };

+               EB3F9C9D21FCFD67007B6EBA /* OctagonTestHarness.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3F9C9B21FCFC60007B6EBA /* OctagonTestHarness.m */; };
+               EB3FB9B8231C12AD00DF52EA /* com.apple.security.trustedpeers.plist in Copy Logging Files */ = {isa = PBXBuildFile; fileRef = EB3FB9B7231C12A800DF52EA /* com.apple.security.trustedpeers.plist */; };
+               EB3FBB4F231F836500DF52EA /* CKKSListenerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3AF52B2229E6C0006577E8 /* CKKSListenerCollection.m */; };
+               EB3FBC09232063A100DF52EA /* SecABC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3FBBF52320629400DF52EA /* SecABC.m */; };

                EB413B801E663AEB00592085 /* PairingChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB413B761E6624A500592085 /* PairingChannel.m */; };
                EB413B821E663AFA00592085 /* PairingChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = EB413B751E6624A400592085 /* PairingChannel.h */; settings = {ATTRIBUTES = (Public, ); }; };
                EB425CA21C65846D000ECE53 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EB413B801E663AEB00592085 /* PairingChannel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB413B761E6624A500592085 /* PairingChannel.m */; };
                EB413B821E663AFA00592085 /* PairingChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = EB413B751E6624A400592085 /* PairingChannel.h */; settings = {ATTRIBUTES = (Public, ); }; };
                EB425CA21C65846D000ECE53 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };


@@ -5286,16 +6117,12 @@
                EB433A291CC3244C00A7EACE /* secitemstresstest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB433A1E1CC3242C00A7EACE /* secitemstresstest.m */; };
                EB433A2A1CC3246800A7EACE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EB433A2E1CC325E900A7EACE /* secitemstresstest.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = EB433A2D1CC325E900A7EACE /* secitemstresstest.entitlements */; };
                EB433A291CC3244C00A7EACE /* secitemstresstest.m in Sources */ = {isa = PBXBuildFile; fileRef = EB433A1E1CC3242C00A7EACE /* secitemstresstest.m */; };
                EB433A2A1CC3246800A7EACE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                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 */; };
+               EB49B2B1202D8780003F34A0 /* mockaksKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = EB49B2B0202D8780003F34A0 /* mockaksKeychain.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 */; };
                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 */; };
                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 */; };
                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 */; };
+               EB49B2C1202DEF8D003F34A0 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.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 */; };
                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 */; };


@@ -5303,208 +6130,285 @@
                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 */; };
                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 */; };
                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 */; };
+               EB49B2D9202DF1F7003F34A0 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };

                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 */; };
                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 */; };

-               EB49B2E5202DFEB3003F34A0 /* mockaks.m in Sources */ = {isa = PBXBuildFile; fileRef = EB49B2E4202DFE7F003F34A0 /* mockaks.m */; };

                EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
                EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };

-               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 */; };
                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, ); }; };
                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, ); }; };

+               EB627A73233E339200F32437 /* MockAKSOptionalParameters.proto in Sources */ = {isa = PBXBuildFile; fileRef = EB627A6F233E323600F32437 /* MockAKSOptionalParameters.proto */; };
+               EB627A7E233E3C1300F32437 /* MockAKSOptionalParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = EB627A77233E342B00F32437 /* MockAKSOptionalParameters.m */; };
+               EB627A7F233E3C1600F32437 /* MockAKSRefKey.m in Sources */ = {isa = PBXBuildFile; fileRef = EB627A75233E342800F32437 /* MockAKSRefKey.m */; };

                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 */; };
                EB6928F91D9ED5BA00062A18 /* SecRecoveryKey.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */; };
                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 */; };
                EB6928F91D9ED5BA00062A18 /* SecRecoveryKey.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */; };

+               EB69528A223B75C300F02C1C /* SFKeychainServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 47FF17241FD60ACA00875565 /* SFKeychainServer.h */; };
+               EB69528B223B75C300F02C1C /* SecItemBackupServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C9D1D8085D800865A7C /* SecItemBackupServer.h */; };
+               EB69528C223B75C300F02C1C /* SecCDKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */; };
+               EB69528E223B75C300F02C1C /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C8E1D8085D800865A7C /* SecDbItem.c */; };
+               EB69528F223B75C300F02C1C /* SecAKSObjCWrappers.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */; };
+               EB695290223B75C300F02C1C /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };
+               EB695291223B75C300F02C1C /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
+               EB695294223B75C300F02C1C /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               EB695295223B75C300F02C1C /* SecItemDb.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C961D8085D800865A7C /* SecItemDb.c */; };
+               EB695296223B75C300F02C1C /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
+               EB695297223B75C300F02C1C /* SecDbKeychainMetadataKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */; };
+               EB695298223B75C300F02C1C /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               EB69529A223B75C300F02C1C /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               EB69529B223B75C300F02C1C /* SecDbBackupManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */; };
+               EB69529C223B75C300F02C1C /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
+               EB69529D223B75C300F02C1C /* SecItemSchema.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C981D8085D800865A7C /* SecItemSchema.c */; };
+               EB69529E223B75C300F02C1C /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               EB69529F223B75C300F02C1C /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
+               EB6952A0223B75C300F02C1C /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
+               EB6952A1223B75C300F02C1C /* SecDbKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */; };
+               EB6952A2223B75C300F02C1C /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               EB6952A3223B75C300F02C1C /* SecDbKeychainSerializedMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */; };
+               EB6952A4223B75C300F02C1C /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               EB6952A5223B75C300F02C1C /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
+               EB6952A6223B75C300F02C1C /* SecDbQuery.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C921D8085D800865A7C /* SecDbQuery.c */; };
+               EB6952A7223B75C300F02C1C /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
+               EB6952A8223B75C300F02C1C /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               EB6952A9223B75C300F02C1C /* SecDbKeychainItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */; };
+               EB6952AB223B75C300F02C1C /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB6952AC223B75C300F02C1C /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };
+               EB6952AD223B75C300F02C1C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               EB6952AE223B75C300F02C1C /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               EB6952AF223B75C300F02C1C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
+               EB6952B0223B75C300F02C1C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               EB6952B1223B75C300F02C1C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4911167209558900066A1E4 /* CoreData.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+               EB6952B2223B75C300F02C1C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               EB6952B3223B75C300F02C1C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
+               EB6952BD223B786800F02C1C /* com.apple.secitemd.plist in launchd plist */ = {isa = PBXBuildFile; fileRef = EB6952BC223B783500F02C1C /* com.apple.secitemd.plist */; };
+               EB6952BE223B793100F02C1C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };

                EB69AB301BF4348000913AF1 /* SecEMCSPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = EB69AB091BF4347700913AF1 /* SecEMCSPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                EB69AB301BF4348000913AF1 /* SecEMCSPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = EB69AB091BF4347700913AF1 /* SecEMCSPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

+               EB71CF7822E825AF00DA3D0E /* SecTapToRadar.m in Sources */ = {isa = PBXBuildFile; fileRef = EB71CF6422E8238000DA3D0E /* SecTapToRadar.m */; };
+               EB74CC172207E48000F1BBAD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D458C500214E1FAF0043D982 /* Foundation.framework */; };
+               EB74CC1F2207E4BA00F1BBAD /* KeychainSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = EB74CC1D2207E4BA00F1BBAD /* KeychainSettings.h */; };
+               EB74CC242207EB9800F1BBAD /* KeychainSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = EB74CC1E2207E4BA00F1BBAD /* KeychainSettings.m */; };
+               EB74CC262207ECCC00F1BBAD /* Preferences.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB74CC252207ECCB00F1BBAD /* Preferences.framework */; };
+               EB74CC272207ECE100F1BBAD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               EB74CC282207EE4300F1BBAD /* KeychainSettings.plist in Resources */ = {isa = PBXBuildFile; fileRef = EB74CC212207E4FA00F1BBAD /* KeychainSettings.plist */; };
+               EB74CC2F2207FBF600F1BBAD /* KeychainSettingsOctagonPeers.plist in Resources */ = {isa = PBXBuildFile; fileRef = EB74CC2E2207FBE900F1BBAD /* KeychainSettingsOctagonPeers.plist */; };

                EB75B4821E753EAA00E469CC /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D847C51C6BE9710025BB44 /* KeychainCircle.framework */; };
                EB75B4871E75400200E469CC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                EB75B4881E75401700E469CC /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
                EB75B4891E75402400E469CC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
                EB75B4821E753EAA00E469CC /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7D847C51C6BE9710025BB44 /* KeychainCircle.framework */; };
                EB75B4871E75400200E469CC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
                EB75B4881E75401700E469CC /* ApplePushService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC9EBA231DEE36FE00D0F733 /* ApplePushService.framework */; };
                EB75B4891E75402400E469CC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };

-               EB75B48A1E75405100E469CC /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };

                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.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 */; };
+               EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };

                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                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 */; };

                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */ = {isa = PBXBuildFile; fileRef = EB75B4931E75A44100E469CC /* SOSPiggyback.h */; };
                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */ = {isa = PBXBuildFile; fileRef = EB75B4931E75A44100E469CC /* SOSPiggyback.h */; };

-               EB75B4961E75A44100E469CC /* SOSPiggyback.m in Sources */ = {isa = PBXBuildFile; fileRef = EB75B4941E75A44100E469CC /* SOSPiggyback.m */; };

                EB76B7591DCB0CA200C43FBC /* CloudKeychainProxy.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = DC24B5851DA432E900330B48 /* CloudKeychainProxy.8 */; };
                EB76B7591DCB0CA200C43FBC /* CloudKeychainProxy.8 in Install man8 page */ = {isa = PBXBuildFile; fileRef = DC24B5851DA432E900330B48 /* CloudKeychainProxy.8 */; };

+               EB7732C221963B0500FCF513 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB7732D921963BA500FCF513 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EB80DE57219600CF005B10FA /* libz.dylib */; };

                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 */; };
                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 */; };

+               EB7AFAF422323CB6004EF091 /* com.apple.recovery_securityd.plist in launchd plist */ = {isa = PBXBuildFile; fileRef = EB8908BB21F20E0200F0DDDB /* com.apple.recovery_securityd.plist */; };
+               EB7E91152194846E00B1FA21 /* SecMetrics.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90EC2193A54100B1FA21 /* SecMetrics.m */; };
+               EB7E91172194847A00B1FA21 /* SecEventMetric.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91122194826F00B1FA21 /* SecEventMetric.m */; };
+               EB7E91182194849900B1FA21 /* SECC2MPCloudKitInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91042193F97400B1FA21 /* SECC2MPCloudKitInfo.m */; };
+               EB7E91192194849900B1FA21 /* SECC2MPCloudKitOperationGroupInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91062193F97500B1FA21 /* SECC2MPCloudKitOperationGroupInfo.m */; };
+               EB7E911A2194849900B1FA21 /* SECC2MPCloudKitOperationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90FC2193F97100B1FA21 /* SECC2MPCloudKitOperationInfo.m */; };
+               EB7E911B2194849900B1FA21 /* SECC2MPDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90F92193F97000B1FA21 /* SECC2MPDeviceInfo.m */; };
+               EB7E911C2194849900B1FA21 /* SECC2MPError.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90FD2193F97100B1FA21 /* SECC2MPError.m */; };
+               EB7E911D2194849900B1FA21 /* SECC2MPGenericEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91022193F97300B1FA21 /* SECC2MPGenericEvent.m */; };
+               EB7E911E2194849900B1FA21 /* SECC2MPGenericEventMetric.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90FF2193F97200B1FA21 /* SECC2MPGenericEventMetric.m */; };
+               EB7E911F2194849900B1FA21 /* SECC2MPGenericEventMetricValue.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E910A2193F97600B1FA21 /* SECC2MPGenericEventMetricValue.m */; };
+               EB7E91202194849900B1FA21 /* SECC2MPInternalTestConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E90FA2193F97000B1FA21 /* SECC2MPInternalTestConfig.m */; };
+               EB7E91212194849900B1FA21 /* SECC2MPMetric.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91052193F97400B1FA21 /* SECC2MPMetric.m */; };
+               EB7E91222194849900B1FA21 /* SECC2MPNetworkEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91072193F97500B1FA21 /* SECC2MPNetworkEvent.m */; };
+               EB7E91232194849900B1FA21 /* SECC2MPServerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E910B2193F97700B1FA21 /* SECC2MPServerInfo.m */; };
+               EB7ECF9623467FB400CE2D3C /* Cuttlefish.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */; };
+               EB80DE162195EDA4005B10FA /* SecC2DeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7E91102193FB7E00B1FA21 /* SecC2DeviceInfo.m */; };
+               EB80DE38219600A8005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE54219600B4005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE55219600BF005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE56219600C6005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE59219600DF005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE5A219600F2005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE5B219600FC005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE5C2196010F005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB80DE5D21960C0A005B10FA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB86BEF6222C3C0500EC0F13 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
+               EB89086821F17D3C00F0DDDB /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
+               EB89086921F17D3C00F0DDDB /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
+               EB89086A21F17D3C00F0DDDB /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 790850840CA87CF00083CC4D /* server.c */; };
+               EB89086B21F17D3C00F0DDDB /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
+               EB89086C21F17D3C00F0DDDB /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
+               EB89086D21F17D3C00F0DDDB /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
+               EB89086E21F17D3C00F0DDDB /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
+               EB89087021F17D3C00F0DDDB /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
+               EB89087221F17D3C00F0DDDB /* libMobileGestalt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */; };
+               EB89087321F17D3C00F0DDDB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
+               EB89087421F17D3C00F0DDDB /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               EB89087521F17D3C00F0DDDB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
+               EB89087921F17D3C00F0DDDB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C32C0AF0A4975F6002891BD /* Security.framework */; };
+               EB89087B21F17D3C00F0DDDB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
+               EB89087E21F17D3C00F0DDDB /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
+               EB8908A521F1870800F0DDDB /* SecCDKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */; };
+               EB8908A621F1871800F0DDDB /* SFKeychainServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 47FF17241FD60ACA00875565 /* SFKeychainServer.h */; };
+               EB8908A721F1882300F0DDDB /* SecItemDb.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C961D8085D800865A7C /* SecItemDb.c */; };
+               EB8908A821F1886100F0DDDB /* SecDbQuery.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C921D8085D800865A7C /* SecDbQuery.c */; };
+               EB8908A921F1888300F0DDDB /* SecItemServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9A1D8085D800865A7C /* SecItemServer.c */; };
+               EB8908AA21F18BBF00F0DDDB /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C8E1D8085D800865A7C /* SecDbItem.c */; };
+               EB8908AB21F18BFD00F0DDDB /* SecKeybagSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */; };
+               EB8908AC21F18C4200F0DDDB /* SecItemSchema.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C981D8085D800865A7C /* SecItemSchema.c */; };
+               EB8908AD21F18CEF00F0DDDB /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */; };
+               EB8908AE21F18D0E00F0DDDB /* SecDbKeychainItem.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */; };
+               EB8908AF21F18D3500F0DDDB /* SecDbKeychainItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */; };
+               EB8908B021F18D7B00F0DDDB /* SecDbKeychainSerializedMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */; };
+               EB8908B121F18DB600F0DDDB /* SecDbKeychainMetadataKeyStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */; };
+               EB8908B221F18E1400F0DDDB /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
+               EB8908B321F18E3200F0DDDB /* SecItemBackupServer.h in Headers */ = {isa = PBXBuildFile; fileRef = DCC78C9D1D8085D800865A7C /* SecItemBackupServer.h */; };
+               EB8908B421F18E4A00F0DDDB /* SecItemBackupServer.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */; };
+               EB8908B721F1943200F0DDDB /* SecDbKeychainSerializedSecretData.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */; };
+               EB8908B821F1944500F0DDDB /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */; };
+               EB8908B921F1953100F0DDDB /* CheckV12DevEnabled.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */; };
+               EB8908BA21F1957300F0DDDB /* SecAKSObjCWrappers.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */; };
+               EB8908BE21F2181600F0DDDB /* SFKeychainControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */; };
+               EB8A9381233C900D0015A794 /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
+               EB973651234E8F4B00518B2B /* CKKSPBFileStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = EB97364F234E8F4A00518B2B /* CKKSPBFileStorage.h */; };
+               EB973652234E8F4B00518B2B /* CKKSPBFileStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = EB973650234E8F4B00518B2B /* CKKSPBFileStorage.m */; };
+               EB9795B522FE9256002BDBFB /* SecItemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6D1D5322FE8D3000205E83 /* SecItemTests.m */; };
+               EB9B285721C77C8D00173DC2 /* OTDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE06E521C6E26000FB1493 /* OTDefines.m */; };
+               EB9B285821C77C8D00173DC2 /* OTDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE06E521C6E26000FB1493 /* OTDefines.m */; };

                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 */; };
                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 */; };

-               EB9C1DB51BDFD50100F89272 /* Security.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EB9C1DAD1BDFD49400F89272 /* Security.plist */; };

                EBA689031E74732700FF90A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBA9AA811CE30E58004E2B68 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBA9AA821CE30E58004E2B68 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBA9AA871CE30E6F004E2B68 /* secitemnotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA9AA7C1CE30CE7004E2B68 /* secitemnotifications.m */; };
                EBA689031E74732700FF90A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBA9AA811CE30E58004E2B68 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBA9AA821CE30E58004E2B68 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBA9AA871CE30E6F004E2B68 /* secitemnotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA9AA7C1CE30CE7004E2B68 /* secitemnotifications.m */; };

+               EBB02A6A2220649F007241CB /* KeychainSettingsCKKSViews.plist in Resources */ = {isa = PBXBuildFile; fileRef = EBB02A56221FF362007241CB /* KeychainSettingsCKKSViews.plist */; };
+               EBB02A702220ED26007241CB /* CKKSLaunchSequence.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB02A6D2220ED16007241CB /* CKKSLaunchSequence.m */; };
+               EBB0315822223AAF007241CB /* CKKSLaunchSequenceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB03155222237A7007241CB /* CKKSLaunchSequenceTests.m */; };

                EBB407B31EBA46B200A541A5 /* CKKSPowerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */; };
                EBB407B31EBA46B200A541A5 /* CKKSPowerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */; };

-               EBB407B41EBA46B300A541A5 /* CKKSPowerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */; };

                EBB839B01E2968AB00853BAC /* secfuzzer.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB8399B1E295B8F00853BAC /* secfuzzer.m */; };
                EBB839B11E2968B400853BAC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBB839B01E2968AB00853BAC /* secfuzzer.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB8399B1E295B8F00853BAC /* secfuzzer.m */; };
                EBB839B11E2968B400853BAC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };

+               EBB8520922F7914A00424FD0 /* SecXPCHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A04BB22229872CB001848A0 /* SecXPCHelperTests.m */; };
+               EBB8520A22F7914A00424FD0 /* SecTapToRadarTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6AC0AA22F22E80003F067B /* SecTapToRadarTests.m */; };
+               EBB8521B22F7945600424FD0 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CCDF78B1E3C26BC003F2555 /* XCTest.framework */; };
+               EBB8521D22F7948B00424FD0 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               EBB8528122F79F6E00424FD0 /* SecXPCHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A04BB14229866F7001848A0 /* SecXPCHelper.m */; };
+               EBB852CF22F7A05600424FD0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
+               EBB852D022F7A13D00424FD0 /* SecInternalRelease.c in Sources */ = {isa = PBXBuildFile; fileRef = DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */; };
+               EBC1024422EBF93E0083D356 /* CKKSTests+LockStateTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = EBC1023022EBF8AC0083D356 /* CKKSTests+LockStateTracker.m */; };

                EBC15B1D1DB432F800126882 /* com.apple.secd.sb in Copy Sandbox profile */ = {isa = PBXBuildFile; fileRef = EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */; };
                EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
                EBC15B1D1DB432F800126882 /* com.apple.secd.sb in Copy Sandbox profile */ = {isa = PBXBuildFile; fileRef = EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */; };
                EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };

-               EBC73F2620993FA800AE3350 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };

                EBC73F2720993FC900AE3350 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
                EBC73F2820993FDA00AE3350 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
                EBC73F29209966AF00AE3350 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
                EBC73F2A20996AD400AE3350 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
                EBC73F2B2099785900AE3350 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
                EBC73F2720993FC900AE3350 /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
                EBC73F2820993FDA00AE3350 /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
                EBC73F29209966AF00AE3350 /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
                EBC73F2A20996AD400AE3350 /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
                EBC73F2B2099785900AE3350 /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };

-               EBCE150E1FE6389A002E7CCC /* DeviceSimulator.xpc in Embedded XPC service */ = {isa = PBXBuildFile; fileRef = EB056E3E1FE5E390000A771E /* DeviceSimulator.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-               EBCE16171FE6DE5A002E7CCC /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
-               EBCE16181FE6DE5A002E7CCC /* SFSQLite.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BC1F152EB10082882F /* SFSQLite.m */; };
-               EBCE16191FE6DE5A002E7CCC /* SFSQLiteStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BF1F152EB10082882F /* SFSQLiteStatement.m */; };
-               EBCE16201FE6DE5A002E7CCC /* SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9DB1F1540CE0082882F /* SFAnalytics.m */; };
-               EBCE16221FE6DE5A002E7CCC /* SFAnalyticsActivityTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CBF65381FA147E500A68667 /* SFAnalyticsActivityTracker.m */; };
-               EBCE16231FE6DE5A002E7CCC /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
-               EBCE162C1FE6DE5A002E7CCC /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
-               EBCE162D1FE6DE5A002E7CCC /* SFAnalyticsSQLiteStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */; };
-               EBCE162F1FE6DE5A002E7CCC /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
-               EBCE16311FE6DE5A002E7CCC /* SFAnalyticsMultiSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDB5FED1FA78CB400410924 /* SFAnalyticsMultiSampler.m */; };
-               EBCE16321FE6DE5A002E7CCC /* SFAnalyticsSampler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CDF8DE61F95562B00140B54 /* SFAnalyticsSampler.m */; };
-               EBCE16351FE6DE5A002E7CCC /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
-               EBCE16361FE6DE5A002E7CCC /* server_security_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.c */; };
-               EBCE16371FE6DE5A002E7CCC /* server_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6ACC401E81DF9400125DC5 /* server_endpoint.m */; };
-               EBCE16391FE6DE5A002E7CCC /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
-               EBCE163A1FE6DE5A002E7CCC /* SFObjCType.m in Sources */ = {isa = PBXBuildFile; fileRef = 4723C9BE1F152EB10082882F /* SFObjCType.m */; };
-               EBCE163D1FE6DE5A002E7CCC /* server_entitlement_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */; };
-               EBCE163E1FE6DE5A002E7CCC /* AutoreleaseTest.c in Sources */ = {isa = PBXBuildFile; fileRef = DAEE05551FAD3FC500DF27F3 /* AutoreleaseTest.c */; };
-               EBCE163F1FE6DE5A002E7CCC /* CKKSControl.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */; };
-               EBCE16401FE6DE5A002E7CCC /* CKKSControlProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */; };
-               EBCE16411FE6DE5A002E7CCC /* libDER.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D46246AF1F9AE73F00D63882 /* libDER.a */; };
-               EBCE16421FE6DE5A002E7CCC /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474B5FBF1E662E21007546F8 /* SecurityFoundation.framework */; };
-               EBCE16431FE6DE5A002E7CCC /* libASN1_not_installed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */; };
-               EBCE16451FE6DE5A002E7CCC /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */; };
-               EBCE16461FE6DE5A002E7CCC /* libSecureObjectSyncServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */; };
-               EBCE16471FE6DE5A002E7CCC /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
-               EBCE16481FE6DE5A002E7CCC /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
-               EBCE16491FE6DE5A002E7CCC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
-               EBCE164B1FE6DE5A002E7CCC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               EBCE164C1FE6DE5A002E7CCC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */; };
-               EBCE164E1FE6DE5A002E7CCC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
-               EBCE164F1FE6DE5A002E7CCC /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
-               EBCE16501FE6DE5A002E7CCC /* libaks_acl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF8C1A01472C000958DC /* libaks_acl.a */; };
-               EBCE16511FE6DE5A002E7CCC /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
-               EBCE16521FE6DE5A002E7CCC /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.a */; };
-               EBCE16531FE6DE5A002E7CCC /* libctkclient_sep.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */; };
-               EBCE16541FE6DE5A002E7CCC /* libprequelite.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CE98B5B1FA9360700CF1D54 /* libprequelite.tbd */; };
-               EBCE16551FE6DE5A002E7CCC /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */; };
-               EBCE16561FE6DE5A002E7CCC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
-               EBCE165D1FE71821002E7CCC /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
-               EBCE16601FE732AA002E7CCC /* MultiDeviceNetworking.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE165F1FE7313C002E7CCC /* MultiDeviceNetworking.m */; };
-               EBCE16641FE73679002E7CCC /* MultiDeviceNetworkingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EBCE16611FE73327002E7CCC /* MultiDeviceNetworkingProtocol.h */; };
-               EBCE16661FE736A1002E7CCC /* MultiDeviceNetworkingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EBCE16611FE73327002E7CCC /* MultiDeviceNetworkingProtocol.h */; };
-               EBCE16671FE736A5002E7CCC /* DeviceSimulatorProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EB056E401FE5E390000A771E /* DeviceSimulatorProtocol.h */; };
-               EBCE16681FE736AD002E7CCC /* DeviceSimulatorProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EB056E401FE5E390000A771E /* DeviceSimulatorProtocol.h */; };
-               EBCE166B1FE74688002E7CCC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
-               EBCE166C1FE746A5002E7CCC /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */; };
+               EBCC31B1228CF0FD000AF5D9 /* libMobileGestalt.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */; };

                EBCF73F71CE45F9C00BED7CA /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBCF73F81CE45F9C00BED7CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBCF73FD1CE45FAC00BED7CA /* secitemfunctionality.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCF73F21CE45F8600BED7CA /* secitemfunctionality.m */; };
                EBCF73F71CE45F9C00BED7CA /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBCF73F81CE45F9C00BED7CA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBCF73FD1CE45FAC00BED7CA /* secitemfunctionality.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCF73F21CE45F8600BED7CA /* secitemfunctionality.m */; };

-               EBDD732C20A6A61E003A103A /* SOSAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C7BB0032006B4EE004D1B6B /* SOSAnalytics.m */; };
+               EBD531762198AF0B003A57E6 /* AppleAccount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C84DA541720698900AEE225 /* AppleAccount.framework */; };
+               EBD531772198AF19003A57E6 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF4C19C171E0EA600877419 /* Accounts.framework */; };
+               EBDAA7E920EC4838003EA6E5 /* SecurityLocalKeychain.plist in Install BATS plist */ = {isa = PBXBuildFile; fileRef = EBDAA7E320EC46CF003EA6E5 /* SecurityLocalKeychain.plist */; };
+               EBDAF15D21C75FF200EAE89F /* NSXPCConnectionMock.h in Headers */ = {isa = PBXBuildFile; fileRef = EBDAF15B21C75FF200EAE89F /* NSXPCConnectionMock.h */; };
+               EBDCC002233DD45700806566 /* MockAKSRefKey.proto in Sources */ = {isa = PBXBuildFile; fileRef = EBDCBFFE233DD31700806566 /* MockAKSRefKey.proto */; };
+               EBDE5E0E22BA3DE900A229C8 /* CKKSMockOctagonAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE5DFA22BA3D5D00A229C8 /* CKKSMockOctagonAdapter.m */; };
+               EBDE5E0F22BA3DEA00A229C8 /* CKKSMockOctagonAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE5DFA22BA3D5D00A229C8 /* CKKSMockOctagonAdapter.m */; };
+               EBE2026B20908C7100B48020 /* tpctl.8 in install man8 page */ = {isa = PBXBuildFile; fileRef = EBE2026420908A8A00B48020 /* tpctl.8 */; };

                EBE901721C2283F7007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019A1C22852C007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019B1C2285D4007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019C1C2285DB007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019E1C228610007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE901721C2283F7007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019A1C22852C007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019B1C2285D4007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019C1C2285DB007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };
                EBE9019E1C228610007308C6 /* AggregateDictionary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B368BD179891FC004C37CE /* AggregateDictionary.framework */; };

-               EBEEEE3C1EA31D9600E15F5C /* SOSControlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */; };
-               EBEEEE3D1EA31DB000E15F5C /* SOSControlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */; };
-               EBEEEE3E1EA31DB100E15F5C /* SOSControlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */; };

                EBEEEE3F1EA31E6D00E15F5C /* SOSControlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */; };
                EBEEEE3F1EA31E6D00E15F5C /* SOSControlHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */; };

+               EBF252222155E910000204D6 /* OTJoiningConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8FD546214AEC650098E3FB /* OTJoiningConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               EBF252252155E911000204D6 /* OTJoiningConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8FD546214AEC650098E3FB /* OTJoiningConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };

                EBF2D73C1C1E2B47006AB6FF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBF3745F1DBFB32A0065D840 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EBF3745E1DBFB32A0065D840 /* libobjc.dylib */; };
                EBF374751DC055590065D840 /* security-sysdiagnose.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF374741DC055590065D840 /* security-sysdiagnose.m */; };
                EBF3747E1DC057B40065D840 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBF374801DC058070065D840 /* security-sysdiagnose.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBF3747F1DC057FE0065D840 /* security-sysdiagnose.1 */; };
                EBF2D73C1C1E2B47006AB6FF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7FCBE431314471B000DE34E /* Foundation.framework */; };
                EBF3745F1DBFB32A0065D840 /* libobjc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EBF3745E1DBFB32A0065D840 /* libobjc.dylib */; };
                EBF374751DC055590065D840 /* security-sysdiagnose.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF374741DC055590065D840 /* security-sysdiagnose.m */; };
                EBF3747E1DC057B40065D840 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EBF374801DC058070065D840 /* security-sysdiagnose.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBF3747F1DC057FE0065D840 /* security-sysdiagnose.1 */; };

+               EBF5323A21C8B6330073C1C7 /* OTDefines.m in Sources */ = {isa = PBXBuildFile; fileRef = EBCE06E521C6E26000FB1493 /* OTDefines.m */; };

                EBFF18C41F02A4EF004E58FC /* libsecurity_filedb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC89F1D8B7CBD00070CB0 /* libsecurity_filedb.a */; };
                EBFF18CA1F02A677004E58FC /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                EBFF18CB1F02A68B004E58FC /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                EBFF18CC1F02A6AE004E58FC /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };
                EBFF18C41F02A4EF004E58FC /* libsecurity_filedb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BC89F1D8B7CBD00070CB0 /* libsecurity_filedb.a */; };
                EBFF18CA1F02A677004E58FC /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                EBFF18CB1F02A68B004E58FC /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E43C48C1B00D07000E5ECB2 /* CoreFoundation.framework */; };
                EBFF18CC1F02A6AE004E58FC /* libsecurity_cdsa_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB341821D8A2B860054D16E /* libsecurity_cdsa_utilities.a */; };

+               EBFF95ED214C80880021CD14 /* SecRemoteDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = EB056E421FE5E390000A771E /* SecRemoteDevice.m */; };
+               EBFF95EE214C80B90021CD14 /* OctagonTestHarnessXPCServiceDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E060D1C3212478120025B833 /* OctagonTestHarnessXPCServiceDelegate.m */; };
+               EBFF95EF214C823F0021CD14 /* KeychainCircle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */; };
+               F3384FD42165A049004A2171 /* SecurityCustomSignposts.plist in Install Ariadne Signposts Plist */ = {isa = PBXBuildFile; fileRef = EBD8AD632004B45500588BBA /* SecurityCustomSignposts.plist */; };
+               F3384FD62165A08E004A2171 /* SecurityCustomSignposts.plist in Install Ariadne Signposts Plist */ = {isa = PBXBuildFile; fileRef = EBD8AD632004B45500588BBA /* SecurityCustomSignposts.plist */; };

                F619D71E1ED70BC1005B5F46 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F619D71D1ED70BB0005B5F46 /* main.m */; };
                F667EC5A1E96E9B100203D5C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB10557A1E14DF640003C309 /* Security.framework */; };
                F667EC5B1E96E9B100203D5C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
                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 */; };
                F619D71E1ED70BC1005B5F46 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F619D71D1ED70BB0005B5F46 /* main.m */; };
                F667EC5A1E96E9B100203D5C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB10557A1E14DF640003C309 /* Security.framework */; };
                F667EC5B1E96E9B100203D5C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D40B6A881E2B5F9900CD6EE5 /* Foundation.framework */; };
                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 */; };

+               F681C3AB2386B8C30083F22C /* PreloginUserDb.m in Sources */ = {isa = PBXBuildFile; fileRef = F681C3A82386B8B40083F22C /* PreloginUserDb.m */; };

                F682C1D41F4486F700F1B029 /* libctkloginhelper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F682C1CE1F4486F600F1B029 /* libctkloginhelper.a */; };
                F6AF96681E646CAF00917214 /* libcoreauthd_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4432AF6A1A01458F000958DC /* libcoreauthd_client.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, ); }; };
+               F6B1B48B24144B5F00CB3E3F /* libctkloginhelperlite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B1B48924144B5E00CB3E3F /* libctkloginhelperlite.a */; };
+               F6EEF76F21675E8000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = F6D600702166551800F9F7C9 /* AuthorizationTrampolinePriv.h */; };
+               F6EEF77521675EF000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = F6D600702166551800F9F7C9 /* AuthorizationTrampolinePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               F6F4105324AC622F00369037 /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB2CA4D81D2C28C800AB770F /* libaks.a */; };

                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD0678E1D8CDF7E007602F1 /* SecCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD0678E1D8CDF7E007602F1 /* SecCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };

-               F9C8AFCD223740C800E7D6AE /* requirement.h in Headers */ = {isa = PBXBuildFile; fileRef = F9C8AFCB223740C800E7D6AE /* requirement.h */; };
-               F9C8AFD222374D1100E7D6AE /* requirement.c in Sources */ = {isa = PBXBuildFile; fileRef = F9C8AFC5223740C700E7D6AE /* requirement.c */; };
+               F9F77E98223C2F9A00E5CBF6 /* requirement.c in Sources */ = {isa = PBXBuildFile; fileRef = F9F77E96223C2F7B00E5CBF6 /* requirement.c */; };
+               F9F77E99223C2F9A00E5CBF6 /* requirement.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F77E97223C2F7C00E5CBF6 /* requirement.h */; };
+               FC63722F237B5D1C00973738 /* SecItemServer+SWC.m in Sources */ = {isa = PBXBuildFile; fileRef = FC63722A237B5CF900973738 /* SecItemServer+SWC.m */; };
+               FC637231237B5D2200973738 /* SecItemServer+SWC.m in Sources */ = {isa = PBXBuildFile; fileRef = FC63722A237B5CF900973738 /* SecItemServer+SWC.m */; };

 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */

-               4718AEDE205B39C40068EC3F /* 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";
-               };

                DC58C36E1D77B4AD003C25A4 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                        compilerSpec = com.apple.compilers.proxy.script;
                        filePatterns = "*.exp-in";
                        fileType = pattern.proxy;
                DC58C36E1D77B4AD003C25A4 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                        compilerSpec = com.apple.compilers.proxy.script;
                        filePatterns = "*.exp-in";
                        fileType = pattern.proxy;

+                       inputFiles = (
+                               "$(SRCROOT)/Security.exp-in",
+                       );

                        isEditable = 1;
                        outputFiles = (
                                "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp",
                        );
                        isEditable = 1;
                        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\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";
+                       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 */ = {
+               DCF216DD21ADD5D10029CCC1 /* PBXBuildRule */ = {

                        isa = PBXBuildRule;
                        compilerSpec = com.apple.compilers.proxy.script;
                        filePatterns = "*.proto";
                        fileType = pattern.proxy;
                        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",
+                       inputFiles = (

                        );
                        );

-                       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 = (
                        isEditable = 1;
                        outputFiles = (

-                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.h",
-                               "$(INPUT_FILE_DIR)/source/${INPUT_FILE_BASE}.m",
+                               "$(INPUT_FILE_DIR)/generated_source/${INPUT_FILE_BASE}.h",
+                               "$(INPUT_FILE_DIR)/generated_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";
+                       runOncePerArchitecture = 0;
+                       script = "set -x\n\nprotocompiler --arc --strict --emitDeprecated=NO --outputDir ${INPUT_FILE_DIR}/generated_source --proto ${INPUT_FILE_DIR}/${INPUT_FILE_NAME}\n";

                };
                E7B006FF170B56E700B27966 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                        compilerSpec = com.apple.compilers.proxy.script;
                        filePatterns = "*.exp-in";
                        fileType = pattern.proxy;
                };
                E7B006FF170B56E700B27966 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                        compilerSpec = com.apple.compilers.proxy.script;
                        filePatterns = "*.exp-in";
                        fileType = pattern.proxy;

+                       inputFiles = (
+                               "$(SRCROOT)/Security.exp-in",
+                       );

                        isEditable = 1;
                        outputFiles = (
                        isEditable = 1;
                        outputFiles = (

-                               "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp",
+                               "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).exp",

                        );
                        );

-                       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";
+                       runOncePerArchitecture = 0;
+                       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 ${HEADER_SEARCH_OPTIONS} ${OTHER_INPUT_FILE_FLAGS} ${PREPROCESSOR} \"${INPUT_FILE_PATH}\" -o \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.exp\"\n";

                };
 /* End PBXBuildRule section */
 
                };
 /* End PBXBuildRule section */
 


@@ -5523,6 +6427,20 @@
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };

+               0C2B36C223C42EBC00000718 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CD743A523C3EC8000FA0EC5;
+                       remoteInfo = Clique;
+               };
+               0C2B36C423C42EC800000718 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CD743A523C3EC8000FA0EC5;
+                       remoteInfo = Clique;
+               };

                0C2BCBBB1D0640B200ED7A2F /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                0C2BCBBB1D0640B200ED7A2F /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5537,26 +6455,19 @@
                        remoteGlobalIDString = 0C2BCBBD1D0648D100ED7A2F;
                        remoteInfo = dtlsEchoServer;
                };
                        remoteGlobalIDString = 0C2BCBBD1D0648D100ED7A2F;
                        remoteInfo = dtlsEchoServer;
                };

-               0C3E2EA82073F5C400F5B95B /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
-                       remoteInfo = Security_ios;
-               };
-               0C5663ED20BE2E1A0035F362 /* PBXContainerItemProxy */ = {
+               0C65BB4C23C3F31B0063D2B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = 0CD743A523C3EC8000FA0EC5;
+                       remoteInfo = Clique;

                };
                };

-               0C664AB31759270C0092D3D9 /* PBXContainerItemProxy */ = {
+               0C65BB4E23C3F3270063D2B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
-                       remoteInfo = secdtests;
+                       remoteGlobalIDString = 0CD743A523C3EC8000FA0EC5;
+                       remoteInfo = Clique;

                };
                0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;


@@ -5572,12 +6483,19 @@
                        remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
                        remoteInfo = otctl;
                };
                        remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
                        remoteInfo = otctl;
                };

-               0C85DFD51FB38BB6000343A7 /* PBXContainerItemProxy */ = {
+               0C7EB14C23F3D13C0089097B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;
+               };
+               0C7EB14E23F3D1480089097B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC222C371E034D1F00B09171;
-                       remoteInfo = libsecurityd_ios_NO_AKS;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;


@@ -5614,26 +6532,75 @@
                        remoteGlobalIDString = DCC78EA81D8088E200865A7C;
                        remoteInfo = security;
                };
                        remoteGlobalIDString = DCC78EA81D8088E200865A7C;
                        remoteInfo = security;
                };

-               0C99B73F131C984900584CF4 /* PBXContainerItemProxy */ = {
+               0CA378E823876E0900090B7E /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
-                       remoteInfo = dtlsTests;
+                       remoteGlobalIDString = 0CA378E123876DD100090B7E;
+                       remoteInfo = reset_account;

                };
                };

-               0C9AEEB920783FE000BF6237 /* PBXContainerItemProxy */ = {
+               0CA378EA23876E1000090B7E /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC1789031D77980500B50D50;
-                       remoteInfo = Security_osx;
+                       remoteGlobalIDString = 0CA378E123876DD100090B7E;
+                       remoteInfo = reset_account;

                };
                };

-               0CC827F1138712B100BD99B7 /* PBXContainerItemProxy */ = {
+               0CC593F72299EDFC006C34B5 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E710C7411331946400F85568;
-                       remoteInfo = SecurityTests;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;
+               };
+               0CCC22AA23F38B0600E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;
+               };
+               0CCC22AC23F38B0E00E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;
+               };
+               0CCC22CD23F39A6300E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CCC220023F357EE00E1FCD0;
+                       remoteInfo = OctagonTrustTests;
+               };
+               0CCC22CF23F39A6A00E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CCC220023F357EE00E1FCD0;
+                       remoteInfo = OctagonTrustTests;
+               };
+               0CCC22D123F39A7500E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CCC220023F357EE00E1FCD0;
+                       remoteInfo = OctagonTrustTests;
+               };
+               0CCC22D323F39A7C00E1FCD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0CCC220023F357EE00E1FCD0;
+                       remoteInfo = OctagonTrustTests;
+               };
+               0CF0920F219649DB002B0AEE /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 5346480017331E1100FE9172;
+                       remoteInfo = KeychainSyncAccountNotification;

                };
                225394B51E30811400D3CD9B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                225394B51E30811400D3CD9B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;


@@ -5656,13 +6623,6 @@
                        remoteGlobalIDString = DCD06AA91D8E0D53007602F1;
                        remoteInfo = security_utilities;
                };
                        remoteGlobalIDString = DCD06AA91D8E0D53007602F1;
                        remoteInfo = security_utilities;
                };

-               3DD1FEF9201C07F30086D049 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
-               };

                3DD1FF4F201C09CD0086D049 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                3DD1FF4F201C09CD0086D049 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5684,6 +6644,27 @@
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };

+               3DD258A1204B7DA800F5DA78 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               3E4D531E2531185D00B124B3 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 3E4D49B32531170600B124B3;
+                       remoteInfo = secsecstaticcodeapitest;
+               };
+               3E88361C24F08F5400E9F4D6 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 3E88360824F068EF00E9F4D6;
+                       remoteInfo = secseccodeapitest;
+               };

                438169E61B4EE4B300C54D58 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                438169E61B4EE4B300C54D58 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5747,27 +6728,6 @@
                        remoteGlobalIDString = 4771D971209A755800BA9772;
                        remoteInfo = KeychainDataclassOwner;
                };
                        remoteGlobalIDString = 4771D971209A755800BA9772;
                        remoteInfo = KeychainDataclassOwner;
                };

-               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;
-               };
-               478D42741FD72A8100CAB645 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
-               };

                47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5775,13 +6735,6 @@
                        remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
                        remoteInfo = libsecurityd_ios;
                };
                        remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
                        remoteInfo = libsecurityd_ios;
                };

-               47A6FC6B206B462400BD6C54 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd_ios;
-               };

                47C2F18B2059CBEA0062DE30 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                47C2F18B2059CBEA0062DE30 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5817,20 +6770,6 @@
                        remoteGlobalIDString = DC1789031D77980500B50D50;
                        remoteInfo = Security_osx;
                };
                        remoteGlobalIDString = DC1789031D77980500B50D50;
                        remoteInfo = Security_osx;
                };

-               47D991CF20407F7E0078CAE2 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
-                       remoteInfo = secdxctests_ios;
-               };
-               47D991D620407F890078CAE2 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 478D426C1FD72A8100CAB645;
-                       remoteInfo = secdxctests_mac;
-               };

                47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5852,20 +6791,6 @@
                        remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
                        remoteInfo = secdRegressions;
                };
                        remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
                        remoteInfo = secdRegressions;
                };

-               4809F7AD2061B6AA003E72D0 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = EB056E3D1FE5E390000A771E;
-                       remoteInfo = DeviceSimulator;
-               };
-               4809F7AF2061B6B0003E72D0 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = EB05C4F01FE5E48A00D68712;
-                       remoteInfo = MultiDeviceSimulatorTests;
-               };

                4C52D0ED16EFCD720079966E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                4C52D0ED16EFCD720079966E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -5873,266 +6798,266 @@
                        remoteGlobalIDString = 4C52D0B316EFC61E0079966E;
                        remoteInfo = CircleJoinRequested;
                };
                        remoteGlobalIDString = 4C52D0B316EFC61E0079966E;
                        remoteInfo = CircleJoinRequested;
                };

-               4C541F8B0F250C0400E508AE /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
-                       remoteInfo = securityd;
-               };
-               4C541F8D0F250C0900E508AE /* PBXContainerItemProxy */ = {
+               4C541FA00F250C5200E508AE /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
-                       remoteInfo = security;
+                       remoteGlobalIDString = 4C541F840F250BF500E508AE;
+                       remoteInfo = phase2;

                };
                };

-               4C541F8F0F250C0E00E508AE /* PBXContainerItemProxy */ = {
+               52D82BF516A627100078DFE5 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
-                       remoteInfo = sslViewer;
+                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
+                       remoteInfo = CloudKeychainProxy;

                };
                };

-               4C541F910F250C1300E508AE /* PBXContainerItemProxy */ = {
+               5346481A17331ED800FE9172 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
-                       remoteInfo = sslServer;
+                       remoteGlobalIDString = 5346480017331E1100FE9172;
+                       remoteInfo = KeychainSyncAccountNotification;

                };
                };

-               4C541FA00F250C5200E508AE /* PBXContainerItemProxy */ = {
+               5AAE383523D261CF0025CF9E /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C541F840F250BF500E508AE;
-                       remoteInfo = phase2;
+                       remoteGlobalIDString = 5A442F81233C330F00918373;
+                       remoteInfo = experimentTool;

                };
                };

-               4C9DE9EE1181ACA000CF5C27 /* PBXContainerItemProxy */ = {
+               6C14CA0323C4F6830097B572 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
-                       remoteInfo = sslEcdsa;
+                       remoteGlobalIDString = 4718AE2E205B39C40068EC3F;
+                       remoteInfo = libsecurityd_bridge;

                };
                };

-               52D82BF516A627100078DFE5 /* PBXContainerItemProxy */ = {
+               6C16258023C4FFC40086A0FF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
-                       remoteInfo = CloudKeychainProxy;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;

                };
                };

-               5346481A17331ED800FE9172 /* PBXContainerItemProxy */ = {
+               6C16258323C4FFD40086A0FF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5346480017331E1100FE9172;
-                       remoteInfo = KeychainSyncAccountNotification;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               5E10995319A5E80B00A60E2B /* PBXContainerItemProxy */ = {
+               6C16258523C4FFD40086A0FF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5E10992419A5E55800A60E2B;
-                       remoteInfo = ISACLProtectedItems;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               5EF7C2551B00EEF900E5E99C /* PBXContainerItemProxy */ = {
+               6C2045F72424BC4400F9461D /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
-                       remoteInfo = secacltests;
+                       remoteGlobalIDString = 6C2045E92424BA7E00F9461D;
+                       remoteInfo = KeychainStasher;

                };
                };

-               6C24EF491E415109000DE79F /* PBXContainerItemProxy */ = {
+               6C2D797222C06CEB00C3CE32 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
-                       remoteInfo = KeychainEntitledTestRunner;
+                       remoteGlobalIDString = 6C39234421F13E4D00D018AD;
+                       remoteInfo = SecDbBackupTests;

                };
                };

-               6C24EF521E415132000DE79F /* PBXContainerItemProxy */ = {
+               6C2D797422C06CEF00C3CE32 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
-                       remoteInfo = KeychainEntitledTestRunner;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;

                };
                };

-               6C7C38801FD88C4700DFFE68 /* PBXContainerItemProxy */ = {
+               6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
-                       remoteInfo = KeychainAnalyticsTests;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;

                };
                };

-               6C7C38871FD88C5A00DFFE68 /* PBXContainerItemProxy */ = {
+               6C61D3E7242A29BA008AB9BB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
-                       remoteInfo = KeychainAnalyticsTests;
+                       remoteGlobalIDString = 6C963280242A279B00C53CE2;
+                       remoteInfo = stashtester;

                };
                };

-               6C9808301E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2AB23C3DD64003BB2CA /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               6C9808321E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2AD23C3DD64003BB2CA /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };

-               6C9808361E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2E923C3DD9C003BB2CA /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = 6C7BE2A923C3DD64003BB2CA;
+                       remoteInfo = securitytool_bridge;

                };
                };

-               6C9808381E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               6C98083A1E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6CA9690C24ACC5C100C08B5E /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               6C98083C1E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC222C371E034D1F00B09171;
-                       remoteInfo = libsecurityd_ios_NO_AKS;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = supd;

                };
                };

-               6C98086C1E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = supd;

                };
                };

-               6C98086E1E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CC638E6226695B900E5DB0B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               6C9808721E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CC638E8226695B900E5DB0B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };

-               6C9808741E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CC638EA226695C300E5DB0B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
                        remoteInfo = SecureObjectSyncServer;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
                        remoteInfo = SecureObjectSyncServer;
                };

-               6C9808761E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CC638EC226695C300E5DB0B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;
+               };
+               6CC638FD2266AE0A00E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;

                };
                };

-               6C9808781E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6CC638FF2266AE0A00E5DB0B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC222C371E034D1F00B09171;
-                       remoteInfo = libsecurityd_ios_NO_AKS;
+                       remoteGlobalIDString = 6C39234421F13E4D00D018AD;
+                       remoteInfo = SecDbBackupTests;

                };
                };

-               6C98089F1E788B9400E70590 /* PBXContainerItemProxy */ = {
+               6CE2AEAA22B2C1BE00C96AE7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;

-                       remoteInfo = KeychainEntitledTestApp_mac;
+                       remoteInfo = "KeychainEntitledTestApp-mac";

                };
                };

-               6C9808A31E788CB100E70590 /* PBXContainerItemProxy */ = {
+               6CE2AEAC22B2C1C300C96AE7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CF4A0DF1E4549F200ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_ios;
+                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
+                       remoteInfo = "KeychainEntitledTestApp-mac";

                };
                };

-               6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */ = {
+               6CF33CA52387156600D1E75D /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;

                };
                };

-               6CAA8CE41F82FD08007B6E03 /* PBXContainerItemProxy */ = {
+               6CF33CA72387157200D1E75D /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
-                       remoteInfo = supdctl;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;

                };
                };

-               6CAA8CE81F82FD13007B6E03 /* PBXContainerItemProxy */ = {
+               873C14B121540FED003C9C00 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
-                       remoteInfo = supdctl;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */ = {
+               87EDC39D2141BB8A007B0E64 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
-                       remoteInfo = supd;
+                       remoteGlobalIDString = 4771D971209A755800BA9772;
+                       remoteInfo = KeychainDataclassOwner;

                };
                };

-               6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */ = {
+               87EDC3A12141BB92007B0E64 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
-                       remoteInfo = supd;
+                       remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
+                       remoteInfo = otctl;

                };
                };

-               ACBAF6FD1E941E090007BA2F /* PBXContainerItemProxy */ = {
+               87EDC3A32141BB9B007B0E64 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = ACBAF6991E9417F40007BA2F;
-                       remoteInfo = security_transform_regressions;
+                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
+                       remoteInfo = ckksctl;

                };
                };

-               BE061EAB1EE5EA5600B22118 /* PBXContainerItemProxy */ = {
+               87EDC3A72141BBAA007B0E64 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = BED208D41EDF950E00753952;
-                       remoteInfo = manifeststresstest;
+                       remoteGlobalIDString = 4381690B1B4EDCBD00C54D58;
+                       remoteInfo = SOSCCAuthPlugin;

                };
                };

-               BE061EB21EE5EAC800B22118 /* PBXContainerItemProxy */ = {
+               87EDC3B12141BBD5007B0E64 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = BED208D41EDF950E00753952;
-                       remoteInfo = manifeststresstest;
+                       remoteGlobalIDString = 5346480017331E1100FE9172;
+                       remoteInfo = KeychainSyncAccountNotification;

                };
                };

-               BE061EB61EE5EB9000B22118 /* PBXContainerItemProxy */ = {
+               ACBAF6FD1E941E090007BA2F /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = BED208D41EDF950E00753952;
-                       remoteInfo = manifeststresstest;
+                       remoteGlobalIDString = ACBAF6991E9417F40007BA2F;
+                       remoteInfo = security_transform_regressions;

                };
                };

-               BE061EB81EE5EBA000B22118 /* PBXContainerItemProxy */ = {
+               BE061EB21EE5EAC800B22118 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;


@@ -6153,27 +7078,6 @@
                        remoteGlobalIDString = BE442BA018B7FDB800F24DAE;
                        remoteInfo = swcagent;
                };
                        remoteGlobalIDString = BE442BA018B7FDB800F24DAE;
                        remoteInfo = swcagent;
                };

-               BE9C38C71EB115A7007E2AE1 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
-                       remoteInfo = TrustedPeers;
-               };
-               BE9C38CE1EB115C9007E2AE1 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
-                       remoteInfo = TrustedPeers;
-               };
-               BE9C38D01EB115F4007E2AE1 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
-                       remoteInfo = TrustedPeersTests;
-               };

                BE9C38D21EB11605007E2AE1 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                BE9C38D21EB11605007E2AE1 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;


@@ -6181,12 +7085,12 @@
                        remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
                        remoteInfo = TrustedPeersTests;
                };
                        remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
                        remoteInfo = TrustedPeersTests;
                };

-               BEF88C321EAFFC3F00357577 /* PBXContainerItemProxy */ = {
+               BED01525206EEC710027A2B4 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
-                       remoteInfo = TrustedPeers;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                D40B6A7E1E2B5F3D00CD6EE5 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                D40B6A7E1E2B5F3D00CD6EE5 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;


@@ -6244,3617 +7148,4837 @@
                        remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
                        remoteInfo = libtrustd;
                };
                        remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
                        remoteInfo = libtrustd;
                };

-               D41257F01E941E7D00781F23 /* PBXContainerItemProxy */ = {
+               D41257F61E941E9600781F23 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = D41257CE1E9410A300781F23;
                        remoteInfo = trustd_ios;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = D41257CE1E9410A300781F23;
                        remoteInfo = trustd_ios;
                };

-               D41257F21E941E8600781F23 /* PBXContainerItemProxy */ = {
+               D41AD4511B9788B2008C7270 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = D41257CE1E9410A300781F23;
-                       remoteInfo = trustd_ios;
+                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
+                       remoteInfo = CloudKeychainProxy;

                };
                };

-               D41257F41E941E8E00781F23 /* PBXContainerItemProxy */ = {
+               D42C83A4211636A3008D3D83 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = D41257CE1E9410A300781F23;
-                       remoteInfo = trustd_ios;
+                       remoteGlobalIDString = D44D1F652115893000E76E1A;
+                       remoteInfo = CMS;

                };
                };

-               D41257F61E941E9600781F23 /* PBXContainerItemProxy */ = {
+               D437185321166DD800EA350A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = D41257CE1E9410A300781F23;
-                       remoteInfo = trustd_ios;
+                       remoteGlobalIDString = D42C839721159146008D3D83;
+                       remoteInfo = security_cms;

                };
                };

-               D419C0251E57EACA008619D1 /* PBXContainerItemProxy */ = {
+               D437185821166FC800EA350A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
-                       remoteInfo = sslViewer;
+                       remoteGlobalIDString = D44D1F652115893000E76E1A;
+                       remoteInfo = CMS;

                };
                };

-               D41AD4391B96721E008C7270 /* PBXContainerItemProxy */ = {
+               D437185A211670F600EA350A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
-                       remoteInfo = securityd;
+                       remoteGlobalIDString = D4D1FDDB21165F8B003538E2;
+                       remoteInfo = security_cms_regressions;

                };
                };

-               D41AD43B1B96723B008C7270 /* PBXContainerItemProxy */ = {
+               D437C33021EBF8A000DD1E06 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E710C7411331946400F85568;
-                       remoteInfo = SecurityTests;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               D41AD43D1B967242008C7270 /* PBXContainerItemProxy */ = {
+               D453A4A62122236D00850A26 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
-                       remoteInfo = secdtests;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;

                };
                };

-               D41AD43F1B96724C008C7270 /* PBXContainerItemProxy */ = {
+               D453A4C32122262400850A26 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
-                       remoteInfo = dtlsTests;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               D41AD4411B97866C008C7270 /* PBXContainerItemProxy */ = {
+               D453A4C7212226A900850A26 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
-                       remoteInfo = sslServer;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               D41AD4431B978681008C7270 /* PBXContainerItemProxy */ = {
+               D456A06722AF1866001119F3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
-                       remoteInfo = sslEcdsa;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = securityuploadd;

                };
                };

-               D41AD4451B9786A3008C7270 /* PBXContainerItemProxy */ = {
+               D456A06A22AF1874001119F3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
-                       remoteInfo = securitytool;
+                       remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
+                       remoteInfo = securityuploadd;

                };
                };

-               D41AD4491B9786D8008C7270 /* PBXContainerItemProxy */ = {
+               D456A06C22AF3238001119F3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = F93C49021AB8FCE00047E01A;
-                       remoteInfo = ckcdiagnose.sh;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               D41AD44B1B9786E2008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F4E2224D72C00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
-                       remoteInfo = secacltests;
+                       remoteGlobalIDString = DCE4E68A1D7A37FA00AFB96E;
+                       remoteInfo = security2tool_macos;

                };
                };

-               D41AD44D1B978791008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F512224D76E00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5E10992419A5E55800A60E2B;
-                       remoteInfo = ISACLProtectedItems;
+                       remoteGlobalIDString = DCE4E8DC1D7F39DB00AFB96E;
+                       remoteInfo = "Cloud Keychain Utility";

                };
                };

-               D41AD4511B9788B2008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F532224D7C400D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
-                       remoteInfo = CloudKeychainProxy;
+                       remoteGlobalIDString = F621D0271ED6DCE7000EA569;
+                       remoteInfo = authorizationdump;

                };
                };

-               D41AD45B1B978A7A008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F552224D87C00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
-                       remoteInfo = securityd;
+                       remoteGlobalIDString = DCD06A541D8CE2D5007602F1;
+                       remoteInfo = gkunpack;

                };
                };

-               D41AD45D1B978A7C008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F572224D88F00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
-                       remoteInfo = securitytool;
+                       remoteGlobalIDString = DC610AAD1D7910C3002223DE;
+                       remoteInfo = gk_reset_check_macos;

                };
                };

-               D41AD45F1B978E18008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F592224D8A100D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E710C7411331946400F85568;
-                       remoteInfo = SecurityTests;
+                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
+                       remoteInfo = sslViewer;

                };
                };

-               D41AD4611B978E24008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F5B2224D9F100D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
-                       remoteInfo = secdtests;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;

                };
                };

-               D41AD4651B978F19008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F5D2224DA1000D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
-                       remoteInfo = dtlsTests;
+                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
+                       remoteInfo = secdmockaks;

                };
                };

-               D41AD4671B978F20008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F5F2224DA6600D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
-                       remoteInfo = sslServer;
+                       remoteGlobalIDString = 3DD1FFAC201FDB1D0086D049;
+                       remoteInfo = SecureTransportTests_ios;

                };
                };

-               D41AD4691B978F24008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F612224DA8400D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
-                       remoteInfo = sslViewer;
+                       remoteGlobalIDString = EB108F181E6CE4D2003B0456;
+                       remoteInfo = KCPairingTests;

                };
                };

-               D41AD46B1B978F28008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F632224DA8E00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
-                       remoteInfo = sslEcdsa;
+                       remoteGlobalIDString = E7D847CD1C6BE9720025BB44;
+                       remoteInfo = KeychainCircleTests;

                };
                };

-               D41AD46D1B978F4C008C7270 /* PBXContainerItemProxy */ = {
+               D45D8F652224DA9900D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
-                       remoteInfo = secacltests;
+                       remoteGlobalIDString = D458C505214E20530043D982;
+                       remoteInfo = TrustTests;

                };
                };

-               DA30D6811DF8C93500EC6B43 /* PBXContainerItemProxy */ = {
+               D45D8F692224DA9900D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DA30D6751DF8C8FB00EC6B43;
-                       remoteInfo = KeychainSyncAccountUpdater;
+                       remoteGlobalIDString = D4707A0421136E69005BCFDA;
+                       remoteInfo = TrustTests_ios;

                };
                };

-               DAE40BD420CF3ED5002D5674 /* PBXContainerItemProxy */ = {
+               D45D8F6B2224DABA00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DAE40BC520CF3E46002D5674;
-                       remoteInfo = secitemcanarytest;
+                       remoteGlobalIDString = DC05037521409A4000A8EDB7;
+                       remoteInfo = OCMockUmbrella;

                };
                };

-               DC00678F1D878132005AF8DB /* PBXContainerItemProxy */ = {
+               D45D8F6D2224DB6400D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC6A82911D87749900418608;
-                       remoteInfo = libsecurityd_client_macos;
+                       remoteGlobalIDString = D41257CE1E9410A300781F23;
+                       remoteInfo = trustd_ios;

                };
                };

-               DC0067C31D8787AE005AF8DB /* PBXContainerItemProxy */ = {
+               D45D8F6F2224DB6D00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0067921D87876F005AF8DB;
-                       remoteInfo = libsecurityd_server_macos;
+                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
+                       remoteInfo = securityd_ios;

                };
                };

-               DC0067D21D8788C4005AF8DB /* PBXContainerItemProxy */ = {
+               D45D8F712224DB9200D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0067C51D878898005AF8DB;
-                       remoteInfo = libsecurityd_ucspc;
+                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
+                       remoteInfo = secbackupntest;

                };
                };

-               DC008B591D90CEC7004002A3 /* PBXContainerItemProxy */ = {
+               D45D8F732224DB9C00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC008B451D90CE53004002A3;
-                       remoteInfo = securityd_macos_mig_nomake;
+                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
+                       remoteInfo = secacltests;

                };
                };

-               DC008B5B1D90CEE9004002A3 /* PBXContainerItemProxy */ = {
+               D45D8F772224DBB500D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC008B451D90CE53004002A3;
-                       remoteInfo = securityd_macos_mig_nomake;
+                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
+                       remoteInfo = secdtests_ios;

                };
                };

-               DC008B631D90CF37004002A3 /* PBXContainerItemProxy */ = {
+               D45D8F792224DBBD00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC008B451D90CE53004002A3;
-                       remoteInfo = securityd_macos_mig_nomake;
+                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
+                       remoteInfo = dtlsTests;

                };
                };

-               DC008B651D90CF40004002A3 /* PBXContainerItemProxy */ = {
+               D45D8F7B2224DBC600D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC008B451D90CE53004002A3;
-                       remoteInfo = securityd_macos_mig_nomake;
+                       remoteGlobalIDString = E710C7411331946400F85568;
+                       remoteInfo = SecurityTests;

                };
                };

-               DC00AB691D821C0700513D74 /* PBXContainerItemProxy */ = {
+               D45D8F7D2224DBD900D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC521D80D05200B0A59C;
-                       remoteInfo = liblogging;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;

                };
                };

-               DC00AB711D821C4600513D74 /* PBXContainerItemProxy */ = {
+               D45D8F812224DBE300D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = libsecurity;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;

                };
                };

-               DC00AB731D821C4800513D74 /* PBXContainerItemProxy */ = {
+               D45D8F852224DBF800D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;

                };
                };

-               DC00AB751D821C4C00513D74 /* PBXContainerItemProxy */ = {
+               D45D8F872224DC3F00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
+                       remoteInfo = secdmockaks;

                };
                };

-               DC00AB7D1D821C7F00513D74 /* PBXContainerItemProxy */ = {
+               D45D8F8B2224DC7600D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;

                };
                };

-               DC00AB7F1D821C8300513D74 /* PBXContainerItemProxy */ = {
+               D45D8F8D2224DC8E00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
-                       remoteInfo = libSWCAgent;
+                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
+                       remoteInfo = sslViewer;

                };
                };

-               DC00AB911D821D6000513D74 /* PBXContainerItemProxy */ = {
+               D45D8F8F2224DC9900D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
-                       remoteInfo = libSOSCommands;
+                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
+                       remoteInfo = securitytool_ios;

                };
                };

-               DC00AB931D821D6500513D74 /* PBXContainerItemProxy */ = {
+               D45D8F912224DCCB00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EBC61D80CEF100B0A59C;
-                       remoteInfo = libSecurityCommands;
+                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
+                       remoteInfo = sslServer;

                };
                };

-               DC00AB951D821D6800513D74 /* PBXContainerItemProxy */ = {
+               D45D8F932224DCD700D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EA441D80CB7000B0A59C;
-                       remoteInfo = libSecurityTool;
+                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
+                       remoteInfo = sslEcdsa;

                };
                };

-               DC00AB9D1D821DBB00513D74 /* PBXContainerItemProxy */ = {
+               D45D8F972224DD7B00D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = libsecurity;
+                       remoteGlobalIDString = D41257CE1E9410A300781F23;
+                       remoteInfo = trustd_ios;

                };
                };

-               DC00ABA91D821DE600513D74 /* PBXContainerItemProxy */ = {
+               D45D8F992224DD8200D6C124 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
+                       remoteInfo = securityd_ios;

                };
                };

-               DC00ABAB1D821DE700513D74 /* PBXContainerItemProxy */ = {
+               D469C4E4218BECCE008AC1FC /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = DCE4E9101D7F3D5300AFB96E;
+                       remoteInfo = "Keychain Circle Notification";

                };
                };

-               DC00ABAD1D821DEB00513D74 /* PBXContainerItemProxy */ = {
+               D476BC3822BD34280098E15A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC7E1D80D1A800B0A59C;
-                       remoteInfo = libiOSSecurityRegressions;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;

                };
                };

-               DC00ABAF1D821DF300513D74 /* PBXContainerItemProxy */ = {
+               D476BC3B22BD34320098E15A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
-                       remoteInfo = libSOSRegressions;
+                       remoteGlobalIDString = 6C9AA79D1F7C1D8F00D08296;
+                       remoteInfo = supdctl;

                };
                };

-               DC00ABB11D821DF600513D74 /* PBXContainerItemProxy */ = {
+               D477EE7021ED48A500C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
-                       remoteInfo = libSharedRegressions;
+                       remoteGlobalIDString = EB2D54A11F02A45E00E46890;
+                       remoteInfo = secatomicfile;

                };
                };

-               DC00ABBA1D821E9B00513D74 /* PBXContainerItemProxy */ = {
+               D477EE7221ED48AA00C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = BED208D41EDF950E00753952;
+                       remoteInfo = manifeststresstest;

                };
                };

-               DC00ABBC1D821E9F00513D74 /* PBXContainerItemProxy */ = {
+               D477EE7421ED48B400C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = F667EC561E96E9B100203D5C;
+                       remoteInfo = authdtest;

                };
                };

-               DC00ABBE1D821EA700513D74 /* PBXContainerItemProxy */ = {
+               D477EE7621ED48C000C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52ED631D80D4CD00B0A59C;
-                       remoteInfo = libiOSsecuritydRegressions;
+                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
+                       remoteInfo = seckeychainnetworkextensionstest;

                };
                };

-               DC00ABC81D821F0200513D74 /* PBXContainerItemProxy */ = {
+               D477EE7821ED48C000C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
+                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;

                };
                };

-               DC00ABCA1D821F0500513D74 /* PBXContainerItemProxy */ = {
+               D477EE7A21ED48C000C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
+                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;

                };
                };

-               DC00ABD01D821F1A00513D74 /* PBXContainerItemProxy */ = {
+               D477EE7C21ED48CB00C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = libsecurity;
+                       remoteGlobalIDString = EBB839A41E29665D00853BAC;
+                       remoteInfo = secfuzzer;

                };
                };

-               DC00ABD21D821F1D00513D74 /* PBXContainerItemProxy */ = {
+               D477EE7E21ED48D500C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = EB1055741E14DF430003C309;
+                       remoteInfo = SecCertificateFuzzer;

                };
                };

-               DC00ABD41D821F2700513D74 /* PBXContainerItemProxy */ = {
+               D477EE8021ED48DF00C9AAFF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
+                       remoteInfo = TrustedPeersTests;

                };
                };

-               DC00ABDF1D821F5C00513D74 /* PBXContainerItemProxy */ = {
+               D4794E6A21222E72007C6725 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               DC00ABE11D821F6000513D74 /* PBXContainerItemProxy */ = {
+               D4A763CE2224BCD10063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
-                       remoteInfo = libsecdRegressions;
+                       remoteGlobalIDString = DCE4E7F51D7A4DA800AFB96E;
+                       remoteInfo = secd;

                };
                };

-               DC00ABE31D821F6200513D74 /* PBXContainerItemProxy */ = {
+               D4A763D02224BCDE0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = DCE4E82D1D7A57AE00AFB96E;
+                       remoteInfo = trustd_macos;

                };
                };

-               DC00ABED1D821FB700513D74 /* PBXContainerItemProxy */ = {
+               D4A763D22224BD640063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = libSecureObjectSync;
+                       remoteGlobalIDString = DC610A551D78F9D2002223DE;
+                       remoteInfo = codesign_tests_macos;

                };
                };

-               DC00ABEF1D821FBA00513D74 /* PBXContainerItemProxy */ = {
+               D4A763D42224BD6F0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
-                       remoteInfo = libSOSRegressions;
+                       remoteGlobalIDString = DC610A021D78F129002223DE;
+                       remoteInfo = secdtests_macos;

                };
                };

-               DC0984F61E1DB6D400140ADC /* PBXContainerItemProxy */ = {
+               D4A763D82224BD990063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;

                };
                };

-               DC0984FF1E1DB70A00140ADC /* PBXContainerItemProxy */ = {
+               D4A763DE2224BDDC0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;

                };
                };

-               DC0BB4431ED4D74A0035F886 /* PBXContainerItemProxy */ = {
+               D4A763E02224BDED0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
+                       remoteInfo = secacltests;

                };
                };

-               DC0BC5AE1D8B714000070CB0 /* PBXContainerItemProxy */ = {
+               D4A763E22224BDF90063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5851D8B70E700070CB0;
-                       remoteInfo = security_cdsa_utils;
+                       remoteGlobalIDString = DC610A461D78F48F002223DE;
+                       remoteInfo = SecTaskTest_macos;

                };
                };

-               DC0BC5C01D8B72BB00070CB0 /* PBXContainerItemProxy */ = {
+               D4A763E42224BE170063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
-                       remoteInfo = security_checkpw;
+                       remoteGlobalIDString = DC5AC04F1D8352D900CF422C;
+                       remoteInfo = securityd_macos;

                };
                };

-               DC0BC5D11D8B732300070CB0 /* PBXContainerItemProxy */ = {
+               D4A763E62224BE2F0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
-                       remoteInfo = security_checkpw;
+                       remoteGlobalIDString = DCE4E7CB1D7A4AED00AFB96E;
+                       remoteInfo = sectests_macos;

                };
                };

-               DC0BC5D71D8B73B000070CB0 /* PBXContainerItemProxy */ = {
+               D4A763E82224BE430063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
-                       remoteInfo = security_checkpw;
+                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
+                       remoteInfo = secbackupntest;

                };
                };

-               DC0BC5F61D8B749000070CB0 /* PBXContainerItemProxy */ = {
+               D4A763EA2224BE580063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5E21D8B742200070CB0;
-                       remoteInfo = security_comcryption;
+                       remoteGlobalIDString = DCE4E7311D7A43B500AFB96E;
+                       remoteInfo = SecurityTestsOSX;

                };
                };

-               DC0BC7421D8B762F00070CB0 /* PBXContainerItemProxy */ = {
+               D4A763EC2224BE630063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5F81D8B752B00070CB0;
-                       remoteInfo = security_cryptkit;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;

                };
                };

-               DC0BC7BE1D8B784F00070CB0 /* PBXContainerItemProxy */ = {
+               D4A763EE2224BE6E0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC7451D8B771600070CB0;
-                       remoteInfo = security_cssm;
+                       remoteGlobalIDString = D458C505214E20530043D982;
+                       remoteInfo = TrustTests;

                };
                };

-               DC0BC8C81D8B7D1C00070CB0 /* PBXContainerItemProxy */ = {
+               D4A763F02224BE6E0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC8981D8B7CBD00070CB0;
-                       remoteInfo = security_filedb;
+                       remoteGlobalIDString = D453A4A42122236D00850A26;
+                       remoteInfo = TrustTests_macos;

                };
                };

-               DC0BC8F51D8B7DE700070CB0 /* PBXContainerItemProxy */ = {
+               D4A763F22224BE810063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC8CC1D8B7DA200070CB0;
-                       remoteInfo = security_manifest;
+                       remoteGlobalIDString = E7D847CD1C6BE9720025BB44;
+                       remoteInfo = KeychainCircleTests;

                };
                };

-               DC0BC92B1D8B7EBB00070CB0 /* PBXContainerItemProxy */ = {
+               D4A763F42224BE8A0063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC8F91D8B7E8000070CB0;
-                       remoteInfo = security_mds;
+                       remoteGlobalIDString = EB108F181E6CE4D2003B0456;
+                       remoteInfo = KCPairingTests;

                };
                };

-               DC0BC9641D8B80D200070CB0 /* PBXContainerItemProxy */ = {
+               D4A763F62224BE980063B2B9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC92E1D8B7F6A00070CB0;
-                       remoteInfo = security_ocspd;
+                       remoteGlobalIDString = 3DD1FEF5201C07F30086D049;
+                       remoteInfo = SecureTransportTests_macos;

                };
                };

-               DC0BC9981D8B814A00070CB0 /* PBXContainerItemProxy */ = {
+               D4B68C69211B6E3E009FED69 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC9661D8B810A00070CB0;
-                       remoteInfo = security_pkcs12;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;

                };
                };

-               DC0BC9C61D8B820000070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD582227574200163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC99A1D8B81BE00070CB0;
-                       remoteInfo = security_sd_cspdl;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               DC0BCA751D8B82E900070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD5B2227574C00163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC9C81D8B824700070CB0;
-                       remoteInfo = security_ssl;
+                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
+                       remoteInfo = secdRegressions;

                };
                };

-               DC0BCA771D8B830900070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD5D2227575C00163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
-                       remoteInfo = security_ssl_regressions;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               DC0BCAFF1D8B85E500070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD5F2227576E00163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCA791D8B858600070CB0;
-                       remoteInfo = security_transform;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               DC0BCB2F1D8B89AB00070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD612227578900163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCB011D8B894F00070CB0;
-                       remoteInfo = security_translocate;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DC0BCC1B1D8C655900070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD6622275A4B00163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionHarness;
+                       remoteGlobalIDString = DC05037521409A4000A8EDB7;
+                       remoteInfo = OCMockUmbrella;

                };
                };

-               DC0BCDB61D8C6AD100070CB0 /* PBXContainerItemProxy */ = {
+               D4BFFD682227B30700163B4B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DC0BCDB81D8C6AE000070CB0 /* PBXContainerItemProxy */ = {
+               D4E0E9502224DDE300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = DC05037521409A4000A8EDB7;
+                       remoteInfo = OCMockUmbrella;

                };
                };

-               DC0BCDBA1D8C6AF000070CB0 /* PBXContainerItemProxy */ = {
+               D4E0E9532224DDEA00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
-                       remoteInfo = iOSutilitiesRegressions;
-               };
-               DC1002C81D8E19D70025549C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 4CA1FEBE052A3C8100F22E42;
-                       remoteInfo = libsecurity_cms;
-               };
-               DC1002CA1D8E19D70025549C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = D4C3345C1BE2A2B100D8C1EF;
-                       remoteInfo = libsecurity_cms_regressions;
-               };
-               DC1002D21D8E19F20025549C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 4C817F8405ED4D7A007975E6;
-                       remoteInfo = libsecurity_smime;
-               };
-               DC1002D41D8E19F20025549C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 4C7FAB41056AC7A200FE0C44;
-                       remoteInfo = security_smime;
-               };
-               DC1002D61D8E19F20025549C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 79DC33620D4E6EEA0039E4BC;
-                       remoteInfo = libCMS;
-               };
-               DC1784481D77869A00B50D50 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 4C817F8405ED4D7A007975E6;
-                       remoteInfo = libsecurity_smime;
-               };
-               DC17844A1D77869A00B50D50 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = AC62F5F018B4356A00704BBD;
-                       remoteInfo = libsecurity_smime_regressions;
-               };
-               DC1789781D779C6700B50D50 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4C2741ED03E9FBF700A80181;
-                       remoteInfo = libsecurity_smime;
+                       remoteGlobalIDString = EB108F181E6CE4D2003B0456;
+                       remoteInfo = KCPairingTests;

                };
                };

-               DC178BF21D77ABE300B50D50 /* PBXContainerItemProxy */ = {
+               D4E0E9552224DDF000A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC1789031D77980500B50D50;
-                       remoteInfo = Security_osx;
-               };
-               DC193C5F20CB4C9D009C1A0F /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = D4C3345B1BE2A2B100D8C1EF;
-                       remoteInfo = libsecurity_cms_regressions;
+                       remoteGlobalIDString = E7D847CD1C6BE9720025BB44;
+                       remoteInfo = KeychainCircleTests;

                };
                };

-               DC222C781E034EE700B09171 /* PBXContainerItemProxy */ = {
+               D4E0E9572224DDFE00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC222C371E034D1F00B09171;
-                       remoteInfo = libsecurityd_ios_NO_AKS;
+                       remoteGlobalIDString = D458C505214E20530043D982;
+                       remoteInfo = TrustTests;

                };
                };

-               DC26710F1F3E933700816EED /* PBXContainerItemProxy */ = {
+               D4E0E9592224DDFE00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = D4707A0421136E69005BCFDA;
+                       remoteInfo = TrustTests_ios;

                };
                };

-               DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */ = {
+               D4E0E95B2224DE1000A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
+                       remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
+                       remoteInfo = TrustedPeersTests;

                };
                };

-               DC34CD3320326C3100302481 /* PBXContainerItemProxy */ = {
+               D4E0E95D2224DE1A00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = BED208D41EDF950E00753952;
+                       remoteInfo = manifeststresstest;

                };
                };

-               DC34CD3520326C3B00302481 /* PBXContainerItemProxy */ = {
+               D4E0E95F2224DE2700A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;

                };
                };

-               DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {
+               D4E0E9612224DE3D00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
+                       remoteInfo = secdtests_ios;

                };
                };

-               DC3502CD1E020E2200BC0587 /* PBXContainerItemProxy */ = {
+               D4E0E9632224DE4900A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = E710C7411331946400F85568;
+                       remoteInfo = SecurityTests;

                };
                };

-               DC3502D41E02117600BC0587 /* PBXContainerItemProxy */ = {
+               D4E0E9652224DE5100A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
+                       remoteInfo = secacltests;

                };
                };

-               DC3A4B6A1D91EBEE00E46D4A /* PBXContainerItemProxy */ = {
+               D4E0E9672224DE5700A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC3A4B571D91E9FB00E46D4A;
-                       remoteInfo = CodeSigningHelper;
+                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
+                       remoteInfo = dtlsTests;

                };
                };

-               DC5224F81E4029520021640A /* PBXContainerItemProxy */ = {
+               D4E0E9692224DE6800A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
-                       remoteInfo = CKKSTests;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;

                };
                };

-               DC5224FF1E40295C0021640A /* PBXContainerItemProxy */ = {
+               D4E0E96B2224DE7000A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
-                       remoteInfo = CKKSTests;
+                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
+                       remoteInfo = secdmockaks;

                };
                };

-               DC52E84A1D80BF1100B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E96D2224DE7A00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;

                };
                };

-               DC52EAA41D80CCF600B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E96F2224DE8200A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EA441D80CB7000B0A59C;
-                       remoteInfo = libSecurityTool;
+                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
+                       remoteInfo = seckeychainnetworkextensionstest;

                };
                };

-               DC52EC1F1D80CF7400B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9712224DE8200A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EBC61D80CEF100B0A59C;
-                       remoteInfo = libSecurityCommands;
+                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
+                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;

                };
                };

-               DC52EC3C1D80CFF000B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9732224DE8200A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
-                       remoteInfo = libSOSCommands;
+                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
+                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;

                };
                };

-               DC52EC501D80D03100B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E97B2224DF0300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
-                       remoteInfo = libSWCAgent;
+                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
+                       remoteInfo = securitytool_ios;

                };
                };

-               DC52EC5E1D80D08100B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E97D2224DF0B00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC521D80D05200B0A59C;
-                       remoteInfo = liblogging;
+                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
+                       remoteInfo = sslServer;

                };
                };

-               DC52EC7C1D80D18800B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E97F2224DF0B00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
-                       remoteInfo = libSOSRegressions;
+                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
+                       remoteInfo = sslEcdsa;

                };
                };

-               DC52ECEB1D80D34C00B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9812224DF0B00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC7E1D80D1A800B0A59C;
-                       remoteInfo = libSecurityRegressions;
+                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
+                       remoteInfo = sslViewer;

                };
                };

-               DC52EDA21D80D55300B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9852224DF4E00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52ED631D80D4CD00B0A59C;
-                       remoteInfo = libiOSsecuritydRegressions;
+                       remoteGlobalIDString = D41257CE1E9410A300781F23;
+                       remoteInfo = trustd_ios;

                };
                };

-               DC52EDFB1D80D67C00B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9872224DF5800A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
-                       remoteInfo = libsecdRegressions;
+                       remoteGlobalIDString = 790851B50CA9859F0083CC4D;
+                       remoteInfo = securityd_ios;

                };
                };

-               DC52EE621D80D7D900B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E9892224DF6F00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
-                       remoteInfo = libSharedRegressions;
+                       remoteGlobalIDString = DC05037521409A4000A8EDB7;
+                       remoteInfo = OCMockUmbrella;

                };
                };

-               DC52EE641D80D7F000B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E98B2224DF7700A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
-                       remoteInfo = libSharedRegressions;
+                       remoteGlobalIDString = EB108F181E6CE4D2003B0456;
+                       remoteInfo = KCPairingTests;

                };
                };

-               DC52EE7D1D80D8B100B0A59C /* PBXContainerItemProxy */ = {
+               D4E0E98D2224DF7D00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EE661D80D82600B0A59C;
-                       remoteInfo = libSecItemShimOSX;
+                       remoteGlobalIDString = E7D847CD1C6BE9720025BB44;
+                       remoteInfo = KeychainCircleTests;

                };
                };

-               DC58C4291D77BE03003C25A4 /* PBXContainerItemProxy */ = {
+               D4E0E98F2224DF8500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC1789031D77980500B50D50;
-                       remoteInfo = Security_osx;
+                       remoteGlobalIDString = D458C505214E20530043D982;
+                       remoteInfo = TrustTests;

                };
                };

-               DC58C4421D77C1F8003C25A4 /* PBXContainerItemProxy */ = {
+               D4E0E9912224DF8500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC58C4221D77BDEA003C25A4;
-                       remoteInfo = csparser_osx;
+                       remoteGlobalIDString = D4707A0421136E69005BCFDA;
+                       remoteInfo = TrustTests_ios;

                };
                };

-               DC59E9A51D91C710001BDDF5 /* PBXContainerItemProxy */ = {
+               D4E0E9932224DF8D00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = D447C4DB1D31C9DD0082FC1D;
-                       remoteInfo = libCMSInstall;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;

                };
                };

-               DC59E9A81D91C7CC001BDDF5 /* PBXContainerItemProxy */ = {
+               D4E0E9952224DF9300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = 79DC33610D4E6EEA0039E4BC;
-                       remoteInfo = libCMS;
+                       remoteGlobalIDString = BED208D41EDF950E00753952;
+                       remoteInfo = manifeststresstest;

                };
                };

-               DC5ABE1B1D832F5E00CF422C /* PBXContainerItemProxy */ = {
+               D4E0E9972224DF9A00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC5ABDC41D832DAB00CF422C;
-                       remoteInfo = securitytool_macos;
-               };
-               DC5AC0B41D83533400CF422C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 189D4635166AC95C001D8533;
-                       remoteInfo = securityd_service;
-               };
-               DC5AC0B61D83533400CF422C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 189D465B166C15C1001D8533;
-                       remoteInfo = securitydservicectrl;
-               };
-               DC5AC0B81D83533400CF422C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 1843240E1714797D00196B52;
-                       remoteInfo = securitydservice_client;
-               };
-               DC5AC0BA1D83533400CF422C /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
-                       proxyType = 2;
-                       remoteGlobalIDString = 18F4808E17497521009724DB;
-                       remoteInfo = KeyStoreEvents;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;

                };
                };

-               DC5AC0BC1D83533E00CF422C /* PBXContainerItemProxy */ = {
+               D4E0E9992224DFAD00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = 1843240D1714797D00196B52;
-                       remoteInfo = securitydservice_client;
+                       remoteGlobalIDString = E710C7411331946400F85568;
+                       remoteInfo = SecurityTests;

                };
                };

-               DC5AC0BE1D83534300CF422C /* PBXContainerItemProxy */ = {
+               D4E0E99B2224DFB500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = 189D4634166AC95C001D8533;
-                       remoteInfo = securityd_service;
+                       remoteGlobalIDString = 0C0BDB2E175685B000BC1A7E;
+                       remoteInfo = secdtests_ios;

                };
                };

-               DC5AC12E1D8356DA00CF422C /* PBXContainerItemProxy */ = {
+               D4E0E99D2224DFBA00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC5AC04F1D8352D900CF422C;
-                       remoteInfo = securityd_macos;
+                       remoteGlobalIDString = 0C6799F912F7C37C00712919;
+                       remoteInfo = dtlsTests;

                };
                };

-               DC61096A1D78E60C002223DE /* PBXContainerItemProxy */ = {
+               D4E0E99F2224DFC500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
                        remoteInfo = secacltests;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
                        remoteInfo = secacltests;
                };

-               DC61096C1D78E72C002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9A12224DFCB00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
-                       remoteInfo = secbackupntest;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;

                };
                };

-               DC610A371D78F15C002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9A32224DFD500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC610A021D78F129002223DE;
-                       remoteInfo = secdtests_macos;
+                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
+                       remoteInfo = secdmockaks;

                };
                };

-               DC610A411D78F3A5002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9A52224DFDD00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = F93C49021AB8FCE00047E01A;
-                       remoteInfo = ckcdiagnose.sh;
+                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
+                       remoteInfo = seckeychainnetworkextensionstest;

                };
                };

-               DC610A531D78F759002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9A72224DFDD00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC610A461D78F48F002223DE;
-                       remoteInfo = SecTaskTest_macos;
+                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
+                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;

                };
                };

-               DC610A6B1D78FAA2002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9A92224DFDD00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC610A551D78F9D2002223DE;
-                       remoteInfo = codesign_tests_macos;
+                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
+                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;

                };
                };

-               DC610ABB1D791139002223DE /* PBXContainerItemProxy */ = {
+               D4E0E9AD2224E00600A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC610AAD1D7910C3002223DE;
-                       remoteInfo = gk_reset_check_macos;
+                       remoteGlobalIDString = 4CB740A20A47567C00D641BB;
+                       remoteInfo = securitytool_ios;

                };
                };

-               DC63CAF21D90DF6000C03317 /* PBXContainerItemProxy */ = {
+               D4E0E9AF2224E00F00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
-                       remoteInfo = libsecurityd_macos_mig;
+                       remoteGlobalIDString = 7913B1FF0D172B3900601FE9;
+                       remoteInfo = sslServer;

                };
                };

-               DC63CAF41D90DF6700C03317 /* PBXContainerItemProxy */ = {
+               D4E0E9B12224E00F00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
-                       remoteInfo = libsecurityd_macos_mig;
+                       remoteGlobalIDString = 4C9DE9D11181AC4800CF5C27;
+                       remoteInfo = sslEcdsa;

                };
                };

-               DC63CAF61D90DF7000C03317 /* PBXContainerItemProxy */ = {
+               D4E0E9B32224E00F00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
-                       remoteInfo = libsecurityd_macos_mig;
-               };
-               DC63CAF91D91A16700C03317 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = D4C3345B1BE2A2B100D8C1EF;
-                       remoteInfo = libsecurity_cms_regressions;
+                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
+                       remoteInfo = sslViewer;

                };
                };

-               DC65E7211D8CB27900152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9BB2224E15500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = E060D19B2124780E0025B833;
+                       remoteInfo = OctagonTestHarness;

                };
                };

-               DC65E7251D8CB2E100152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9BD2224E15E00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = E060D19B2124780E0025B833;
+                       remoteInfo = OctagonTestHarness;

                };
                };

-               DC65E7281D8CB2F400152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9BF2224E16A00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = E060D19B2124780E0025B833;
+                       remoteInfo = OctagonTestHarness;

                };
                };

-               DC65E72B1D8CB31200152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9C12224E17300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = E060D19B2124780E0025B833;
+                       remoteInfo = OctagonTestHarness;

                };
                };

-               DC65E72E1D8CB32400152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9C42224E71600A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = iOSutilities;
+                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
+                       remoteInfo = libSWCAgent;

                };
                };

-               DC65E7381D8CB38300152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9C62224E76100A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB3417B1D8A2B860054D16E;
-                       remoteInfo = security_cdsa_utilities;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;

                };
                };

-               DC65E73A1D8CB39300152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9CA2224FB5700A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;

-                       remoteInfo = iOSutilities;
+                       remoteInfo = utilities;

                };
                };

-               DC65E73D1D8CB3C100152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9CE2224FD7A00A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               DC65E73F1D8CB3CD00152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9D02224FE3300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               DC65E7411D8CB3D400152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9D22224FE3300A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DC65E7431D8CB3E000152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9D42224FE4100A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               DC65E7451D8CB3E700152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9D62225023600A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };

-               DC65E7471D8CB3F000152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9DA2225D14500A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
-                       remoteInfo = security_ssl_regressions;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DC65E7491D8CB3FE00152EF0 /* PBXContainerItemProxy */ = {
+               D4E0E9DC2225D1E600A802E0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DC65E74B1D8CB40C00152EF0 /* PBXContainerItemProxy */ = {
+               D4EB53B8223C3CE3009101F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
-                       remoteInfo = utilitiesRegressions;
+                       remoteGlobalIDString = D458C505214E20530043D982;
+                       remoteInfo = TrustTests;

                };
                };

-               DC65E74D1D8CB41E00152EF0 /* PBXContainerItemProxy */ = {
+               D4EB53BA223C3CE3009101F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = D4707A0421136E69005BCFDA;
+                       remoteInfo = TrustTests_ios;

                };
                };

-               DC65E74F1D8CB42700152EF0 /* PBXContainerItemProxy */ = {
+               D4EB53BD223C3D2B009101F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
-                       remoteInfo = security_ssl_regressions;
+                       remoteGlobalIDString = DAE40BC520CF3E46002D5674;
+                       remoteInfo = secitemcanarytest;

                };
                };

-               DC65E7511D8CB45300152EF0 /* PBXContainerItemProxy */ = {
+               D4EB53C8223C4AB5009101F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = 5E10992419A5E55800A60E2B;
+                       remoteInfo = ISACLProtectedItems;

                };
                };

-               DC65E7531D8CB46100152EF0 /* PBXContainerItemProxy */ = {
+               D4EB53CA223C4ABE009101F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = 5E10992419A5E55800A60E2B;
+                       remoteInfo = ISACLProtectedItems;

                };
                };

-               DC65E7551D8CB47600152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B2C22270B23003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4F56B86217FA32000FCA6B7;
+                       remoteInfo = Security_executables_core_ios;

                };
                };

-               DC65E7571D8CB47D00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B3022270B38003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = D4F56BC621813ECF00FCA6B7;
+                       remoteInfo = Security_internal_ios;

                };
                };

-               DC65E7591D8CB48900152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B3222270B4E003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = D4D1D40821ADC9720012C66C;
+                       remoteInfo = Security_executables_core_osx;

                };
                };

-               DC65E75B1D8CB49200152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B3622270B5D003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = D4F56BC221813EC900FCA6B7;
+                       remoteInfo = Security_internal_osx;

                };
                };

-               DC65E75D1D8CB49A00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4422270BB6003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4F56B91217FA40800FCA6B7;
+                       remoteInfo = Security_frameworks_watchos;

                };
                };

-               DC65E75F1D8CB4A300152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4622270BB6003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = D4D1D3FC21AD0B3F0012C66C;
+                       remoteInfo = Security_executables_core_watchos;

                };
                };

-               DC65E7611D8CB4AA00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4822270BB6003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = D41AD42D1B967169008C7270;
+                       remoteInfo = Security_executables_watchos;

                };
                };

-               DC65E7631D8CB4B100152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4A22270BB6003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4F56BCE21813EE800FCA6B7;
+                       remoteInfo = Security_internal_watchos;

                };
                };

-               DC65E7651D8CB4C200152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4C22270BB6003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = D477EE6421ED479500C9AAFF;
+                       remoteInfo = Security_tests_watchos;

                };
                };

-               DC65E7671D8CB4CB00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B4E22270BC0003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB343AD1D8A34FD0054D16E;
-                       remoteInfo = security_keychain_regressions;
+                       remoteGlobalIDString = BEAA0040202B728B00E51F45;
+                       remoteInfo = Security_executables_Swift;

                };
                };

-               DC65E7691D8CB4D300152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5022270BD9003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
-                       remoteInfo = security_ssl_regressions;
+                       remoteGlobalIDString = D4F56B8D217FA3F800FCA6B7;
+                       remoteInfo = Security_frameworks_tvos;

                };
                };

-               DC65E76B1D8CB4DF00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5222270BD9003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4D1D40121AD0B4B0012C66C;
+                       remoteInfo = Security_executables_core_tvos;

                };
                };

-               DC65E76D1D8CB4E600152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5422270BD9003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D41AD4311B967179008C7270;
+                       remoteInfo = Security_executables_tvos;

                };
                };

-               DC65E76F1D8CB4ED00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5622270BD9003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4F56BCA21813EDC00FCA6B7;
+                       remoteInfo = Security_internal_tvos;

                };
                };

-               DC65E7711D8CB4F400152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5822270BD9003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D477EE6021ED477B00C9AAFF;
+                       remoteInfo = Security_tests_tvos;

                };
                };

-               DC65E7731D8CB4FB00152EF0 /* PBXContainerItemProxy */ = {
+               D4F47B5A22270BDE003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = BEAA0040202B728B00E51F45;
+                       remoteInfo = Security_executables_Swift;

                };
                };

-               DC6BC2731D90D07800DD57B3 /* PBXContainerItemProxy */ = {
+               D4F47B5C22270BEB003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC6BC26C1D90CFEF00DD57B3;
-                       remoteInfo = securityd_macos_startup_nomake;
+                       remoteGlobalIDString = DC6D1C70208A547400AB21AF;
+                       remoteInfo = Security_frameworks_bridge;

                };
                };

-               DC6BC27A1D90D11C00DD57B3 /* PBXContainerItemProxy */ = {
+               D4F47B5E22270BEB003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC6BC2751D90D0BE00DD57B3;
-                       remoteInfo = securityd_macos_DTrace_nomake;
+                       remoteGlobalIDString = EB6A6FAE1B90F8810045DC68;
+                       remoteInfo = Security_executables_bridge;

                };
                };

-               DC6BC2811D90D30F00DD57B3 /* PBXContainerItemProxy */ = {
+               D4F47B6022270BEB003483E9 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC6BC27C1D90D1EE00DD57B3;
-                       remoteInfo = security_cssm_generator_nomake;
+                       remoteGlobalIDString = D477EE5C21ED476D00C9AAFF;
+                       remoteInfo = Security_tests_bridge;

                };
                };

-               DC71D8E31D959C000065FB93 /* PBXContainerItemProxy */ = {
+               D4F56B9C217FCA7E00FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd_ios;
+                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
+                       remoteInfo = Security_ios;

                };
                };

-               DC71D8EA1D959C130065FB93 /* PBXContainerItemProxy */ = {
+               D4F56B9E217FCA8600FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
+                       remoteInfo = TrustedPeers;

                };
                };

-               DC71D9E01D95BAC40065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BA4217FCAAA00FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC71D99F1D95BA6C0065FB93;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
+                       remoteInfo = TrustedPeers;

                };
                };

-               DC71D9E21D95BAD50065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BA6217FCAB000FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC71D99F1D95BA6C0065FB93;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
+                       remoteInfo = Security_ios;

                };
                };

-               DC71DA021D95BDEA0065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BAA217FCAF600FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
+                       remoteInfo = KeychainCircle;

                };
                };

-               DC71DA041D95BDF90065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BB22181306900FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
+                       remoteInfo = KeychainCircle;

                };
                };

-               DC71DA061D95BE2F0065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BB62181380600FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
+                       remoteInfo = KeychainCircle;

                };
                };

-               DC71DA0C1D95DD670065FB93 /* PBXContainerItemProxy */ = {
+               D4F56BBA2181387600FCA6B7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSync;
+                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
+                       remoteInfo = KeychainCircle;

                };
                };

-               DC82FFEA1D90D4640085674B /* PBXContainerItemProxy */ = {
+               DA30D6811DF8C93500EC6B43 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC82FFE51D90D3F60085674B;
-                       remoteInfo = security_utilities_DTrace_nomake;
+                       remoteGlobalIDString = DA30D6751DF8C8FB00EC6B43;
+                       remoteInfo = KeychainSyncAccountUpdater;

                };
                };

-               DC82FFF11D90D54F0085674B /* PBXContainerItemProxy */ = {
+               DA41FE1C2241B64800838FB3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC82FFEC1D90D4D20085674B;
-                       remoteInfo = security_ocspd_macos_mig_nomake;
+                       remoteGlobalIDString = DA41FE0D2241ADC000838FB3;
+                       remoteInfo = otpaird;

                };
                };

-               DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */ = {
+               DA41FE1E2241B65A00838FB3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = DA41FE0D2241ADC000838FB3;
+                       remoteInfo = otpaird;

                };
                };

-               DCB332461F47857D00178C30 /* PBXContainerItemProxy */ = {
+               DC00678F1D878132005AF8DB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
-                       remoteInfo = SOSCommands;
+                       remoteGlobalIDString = DC6A82911D87749900418608;
+                       remoteInfo = libsecurityd_client_macos;

                };
                };

-               DCB340181D8A248C0054D16E /* PBXContainerItemProxy */ = {
+               DC0067C31D8787AE005AF8DB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = security_apple_asn1;
+                       remoteGlobalIDString = DC0067921D87876F005AF8DB;
+                       remoteInfo = libsecurityd_server_macos;

                };
                };

-               DCB340891D8A25230054D16E /* PBXContainerItemProxy */ = {
+               DC0067D21D8788C4005AF8DB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB340661D8A24DF0054D16E;
-                       remoteInfo = security_apple_authorization;
+                       remoteGlobalIDString = DC0067C51D878898005AF8DB;
+                       remoteInfo = libsecurityd_ucspc;

                };
                };

-               DCB3412D1D8A29830054D16E /* PBXContainerItemProxy */ = {
+               DC008B591D90CEC7004002A3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB3408E1D8A267C0054D16E;
-                       remoteInfo = security_cdsa_client;
+                       remoteGlobalIDString = DC008B451D90CE53004002A3;
+                       remoteInfo = securityd_macos_mig_nomake;

                };
                };

-               DCB341781D8A2AF10054D16E /* PBXContainerItemProxy */ = {
+               DC008B5B1D90CEE9004002A3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB341301D8A2A010054D16E;
-                       remoteInfo = security_cdsa_plugin;
+                       remoteGlobalIDString = DC008B451D90CE53004002A3;
+                       remoteInfo = securityd_macos_mig_nomake;

                };
                };

-               DCB342361D8A2CD70054D16E /* PBXContainerItemProxy */ = {
+               DC008B631D90CF37004002A3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB3417B1D8A2B860054D16E;
-                       remoteInfo = security_cdsa_utilities;
+                       remoteGlobalIDString = DC008B451D90CE53004002A3;
+                       remoteInfo = securityd_macos_mig_nomake;

                };
                };

-               DCB345651D8A36060054D16E /* PBXContainerItemProxy */ = {
+               DC008B651D90CF40004002A3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB3423A1D8A32820054D16E;
-                       remoteInfo = security_keychain;
+                       remoteGlobalIDString = DC008B451D90CE53004002A3;
+                       remoteInfo = securityd_macos_mig_nomake;

                };
                };

-               DCB345B21D8A361F0054D16E /* PBXContainerItemProxy */ = {
+               DC00AB691D821C0700513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCB343AD1D8A34FD0054D16E;
-                       remoteInfo = security_keychain_regressions;
+                       remoteGlobalIDString = DC52EC521D80D05200B0A59C;
+                       remoteInfo = liblogging;

                };
                };

-               DCB515CF1ED3CC36001F1152 /* PBXContainerItemProxy */ = {
+               DC00AB711D821C4600513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C9808681E788AFD00E70590;
-                       remoteInfo = CKKSCloudKitTests_ios;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = libsecurity;

                };
                };

-               DCB515D61ED3CC52001F1152 /* PBXContainerItemProxy */ = {
+               DC00AB731D821C4800513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C98082C1E788AEB00E70590;
-                       remoteInfo = CKKSCloudKitTests_mac;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCB515D81ED3CC6B001F1152 /* PBXContainerItemProxy */ = {
+               DC00AB751D821C4C00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_mac;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCB515DA1ED3CC73001F1152 /* PBXContainerItemProxy */ = {
+               DC00AB7D1D821C7F00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CF4A0DF1E4549F200ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_ios;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCBE6E491D91E23D00A3E5E5 /* PBXContainerItemProxy */ = {
+               DC00AB7F1D821C8300513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD06A541D8CE2D5007602F1;
-                       remoteInfo = gkunpack;
+                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
+                       remoteInfo = libSWCAgent;

                };
                };

-               DCC093771D80ABC300F984E4 /* PBXContainerItemProxy */ = {
+               DC00AB911D821D6000513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = libsecurity;
-               };
-               DCC5BF371D937329008D1E84 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4CA1FEBD052A3C8100F22E42;
-                       remoteInfo = libsecurity_cms;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = libSOSCommands;

                };
                };

-               DCD067821D8CDF58007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABA91D821DE600513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
-                       remoteInfo = codesigning_DTrace;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCD067841D8CDF5C007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABAB1D821DE700513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
-                       remoteInfo = codesigning_SystemPolicy;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD069711D8CE21C007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABAD1D821DEB00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
-                       remoteInfo = codesigning_SystemPolicy;
+                       remoteGlobalIDString = DC52EC7E1D80D1A800B0A59C;
+                       remoteInfo = libiOSSecurityRegressions;

                };
                };

-               DCD069731D8CE21C007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABAF1D821DF300513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
-                       remoteInfo = codesigning_DTrace;
+                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
+                       remoteInfo = libSOSRegressions;

                };
                };

-               DCD06A441D8CE281007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABB11D821DF600513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
-                       remoteInfo = codesigning_SystemPolicy;
+                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
+                       remoteInfo = libSharedRegressions;

                };
                };

-               DCD06A461D8CE281007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABBA1D821E9B00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
-                       remoteInfo = codesigning_DTrace;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCD06A7F1D8CE33B007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABBC1D821E9F00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD067781D8CDF19007602F1;
-                       remoteInfo = security_codesigning;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD06A811D8CE33F007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABBE1D821EA700513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD0696F1D8CE21C007602F1;
-                       remoteInfo = integrity;
+                       remoteGlobalIDString = DC52ED631D80D4CD00B0A59C;
+                       remoteInfo = libiOSsecuritydRegressions;

                };
                };

-               DCD06A831D8CE343007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABC81D821F0200513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD06A421D8CE281007602F1;
-                       remoteInfo = codehost;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCD06A851D8CE348007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABCA1D821F0500513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD069661D8CE105007602F1;
-                       remoteInfo = codesigning_RequirementsLanguage;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD06A871D8CE34D007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABD01D821F1A00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD06A541D8CE2D5007602F1;
-                       remoteInfo = gkunpack;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = libsecurity;

                };
                };

-               DCD06A891D8CE356007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABD21D821F1D00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD067781D8CDF19007602F1;
-                       remoteInfo = security_codesigning;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD06BCE1D8E0F01007602F1 /* PBXContainerItemProxy */ = {
+               DC00ABD41D821F2700513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD06AA91D8E0D53007602F1;
-                       remoteInfo = security_utilities;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCD22D661D8CC387001C9B81 /* PBXContainerItemProxy */ = {
+               DC00ABDF1D821F5C00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
-                       remoteInfo = SOSRegressions;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD22D681D8CC3A6001C9B81 /* PBXContainerItemProxy */ = {
+               DC00ABE11D821F6000513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
-                       remoteInfo = utilitiesRegressions;
+                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
+                       remoteInfo = libsecdRegressions;

                };
                };

-               DCD22D7A1D8CCA07001C9B81 /* PBXContainerItemProxy */ = {
+               DC00ABE31D821F6200513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC9C81D8B824700070CB0;
-                       remoteInfo = security_ssl;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               DCD22D7C1D8CCA18001C9B81 /* PBXContainerItemProxy */ = {
+               DC00ABED1D821FB700513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = libSecureObjectSync;

                };
                };

-               DCD22D7E1D8CCA2C001C9B81 /* PBXContainerItemProxy */ = {
+               DC00ABEF1D821FBA00513D74 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
+                       remoteInfo = libSOSRegressions;

                };
                };

-               DCD22D811D8CCB5A001C9B81 /* PBXContainerItemProxy */ = {
+               DC00C91520B3B73900628BEB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd_ios;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCD22D831D8CCB72001C9B81 /* PBXContainerItemProxy */ = {
+               DC00C91720B3B74600628BEB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;

-                       remoteInfo = SecureObjectSync;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               DCD66DC21D82056C00DB1393 /* PBXContainerItemProxy */ = {
+               DC00C91920B3B74E00628BEB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD66D5E1D8204A700DB1393;
-                       remoteInfo = libSecTrustOSX;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */ = {
+               DC00C91E20B3B7A800628BEB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD66DC41D8205C400DB1393;
-                       remoteInfo = libSecOtrOSX;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               DCD8A19B1E09EEA200E4FA0A /* PBXContainerItemProxy */ = {
+               DC00C92620B3B86800628BEB /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               DCD8A1E51E09F81300E4FA0A /* PBXContainerItemProxy */ = {
+               DC0503602140848100A8EDB7 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = BED987D22099145300607A5F;
+                       remoteInfo = TrustedPeersHelperUnitTests;

                };
                };

-               DCD8A1E81E09F85B00E4FA0A /* PBXContainerItemProxy */ = {
+               DC0984F61E1DB6D400140ADC /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
                        remoteInfo = SecureObjectSyncFramework;
                };

-               DCD8A1EB1E09F88400E4FA0A /* PBXContainerItemProxy */ = {
+               DC0984FF1E1DB70A00140ADC /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               DCD8A1EE1E09F8BC00E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BB4431ED4D74A0035F886 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               DCD8A1F11E09F8DB00E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC5AE1D8B714000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5851D8B70E700070CB0;
+                       remoteInfo = security_cdsa_utils;

                };
                };

-               DCD8A1F41E09F91F00E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC5C01D8B72BB00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
+                       remoteInfo = security_checkpw;

                };
                };

-               DCD8A1F71E09F97300E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC5D11D8B732300070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
+                       remoteInfo = security_checkpw;

                };
                };

-               DCD8A1FA1E09F99700E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC5D71D8B73B000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5B01D8B71FD00070CB0;
+                       remoteInfo = security_checkpw;

                };
                };

-               DCD8A1FD1E09FA1800E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC5F61D8B749000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5E21D8B742200070CB0;
+                       remoteInfo = security_comcryption;

                };
                };

-               DCD8A2021E09FAE500E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC7421D8B762F00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC5F81D8B752B00070CB0;
+                       remoteInfo = security_cryptkit;

                };
                };

-               DCD8A2061E09FB1F00E4FA0A /* PBXContainerItemProxy */ = {
+               DC0BC7BE1D8B784F00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = DC0BC7451D8B771600070CB0;
+                       remoteInfo = security_cssm;

                };
                };

-               DCDB29751FD8839F00B5D242 /* PBXContainerItemProxy */ = {
+               DC0BC8C81D8B7D1C00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C85DFD11FB38BB6000343A7;
-                       remoteInfo = OTTests_osx;
+                       remoteGlobalIDString = DC0BC8981D8B7CBD00070CB0;
+                       remoteInfo = security_filedb;

                };
                };

-               DCDB29771FD883AB00B5D242 /* PBXContainerItemProxy */ = {
+               DC0BC8F51D8B7DE700070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C85DFD11FB38BB6000343A7;
-                       remoteInfo = OTTests_osx;
+                       remoteGlobalIDString = DC0BC8CC1D8B7DA200070CB0;
+                       remoteInfo = security_manifest;

                };
                };

-               DCE4E6A91D7A38E700AFB96E /* PBXContainerItemProxy */ = {
+               DC0BC92B1D8B7EBB00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E68A1D7A37FA00AFB96E;
-                       remoteInfo = security2tool_macos;
+                       remoteGlobalIDString = DC0BC8F91D8B7E8000070CB0;
+                       remoteInfo = security_mds;

                };
                };

-               DCE4E7B71D7A456500AFB96E /* PBXContainerItemProxy */ = {
+               DC0BC9641D8B80D200070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E7311D7A43B500AFB96E;
-                       remoteInfo = SecurityTestsOSX;
+                       remoteGlobalIDString = DC0BC92E1D8B7F6A00070CB0;
+                       remoteInfo = security_ocspd;

                };
                };

-               DCE4E7BB1D7A45ED00AFB96E /* PBXContainerItemProxy */ = {
+               DC0BC9981D8B814A00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = AC62F5EF18B4356A00704BBD;
-                       remoteInfo = libsecurity_smime_regressions;
+                       remoteGlobalIDString = DC0BC9661D8B810A00070CB0;
+                       remoteInfo = security_pkcs12;

                };
                };

-               DCE4E7D71D7A4B3500AFB96E /* PBXContainerItemProxy */ = {
+               DC0BC9C61D8B820000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = AC62F5EF18B4356A00704BBD;
-                       remoteInfo = libsecurity_smime_regressions;
+                       remoteGlobalIDString = DC0BC99A1D8B81BE00070CB0;
+                       remoteInfo = security_sd_cspdl;

                };
                };

-               DCE4E7F01D7A4BEC00AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCA751D8B82E900070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E7CB1D7A4AED00AFB96E;
-                       remoteInfo = sectests_macos;
+                       remoteGlobalIDString = DC0BC9C81D8B824700070CB0;
+                       remoteInfo = security_ssl;

                };
                };

-               DCE4E8291D7A4F2500AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCA771D8B830900070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E7F51D7A4DA800AFB96E;
-                       remoteInfo = secd;
+                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
+                       remoteInfo = security_ssl_regressions;

                };
                };

-               DCE4E8611D7A58BA00AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCAFF1D8B85E500070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E82D1D7A57AE00AFB96E;
-                       remoteInfo = trustd;
+                       remoteGlobalIDString = DC0BCA791D8B858600070CB0;
+                       remoteInfo = security_transform;

                };
                };

-               DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCB2F1D8B89AB00070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E8931D7F34F600AFB96E;
-                       remoteInfo = authd;
+                       remoteGlobalIDString = DC0BCB011D8B894F00070CB0;
+                       remoteInfo = security_translocate;

                };
                };

-               DCE4E90B1D7F3B4A00AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCC1B1D8C655900070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E8DC1D7F39DB00AFB96E;
-                       remoteInfo = "Cloud Keychain Utility";
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionHarness;

                };
                };

-               DCE4E9721D7F3FC200AFB96E /* PBXContainerItemProxy */ = {
+               DC0BCDB61D8C6AD100070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCE4E9101D7F3D5300AFB96E;
-                       remoteInfo = "Keychain Circle Notification";
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */ = {
+               DC0BCDB81D8C6AE000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
-                       remoteInfo = SOSCommands;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               DCF785001D88B80600E694BB /* PBXContainerItemProxy */ = {
+               DC0BCDBA1D8C6AF000070CB0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF7830A1D88B4DE00E694BB;
-                       remoteInfo = security_apple_csp;
+                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
+                       remoteInfo = iOSutilitiesRegressions;

                };
                };

-               DCF787311D88C1B000E694BB /* PBXContainerItemProxy */ = {
+               DC178BF21D77ABE300B50D50 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF785021D88B95500E694BB;
-                       remoteInfo = security_apple_cspdl;
+                       remoteGlobalIDString = DC1789031D77980500B50D50;
+                       remoteInfo = Security_osx;

                };
                };

-               DCF788451D88C98100E694BB /* PBXContainerItemProxy */ = {
+               DC26710F1F3E933700816EED /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF788341D88C8C400E694BB;
-                       remoteInfo = security_apple_filedl;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               DCF788A31D88CB6000E694BB /* PBXContainerItemProxy */ = {
+               DC27C3CC20EAFDF800F7839C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF788471D88CA7200E694BB;
-                       remoteInfo = security_apple_x509_cl;
+                       remoteGlobalIDString = DC99B85B20EACA470065B73B;
+                       remoteInfo = OctagonTests;

                };
                };

-               DCF788A81D88CC3500E694BB /* PBXContainerItemProxy */ = {
+               DC311E662124A9D2002F5EAE /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF788471D88CA7200E694BB;
-                       remoteInfo = security_apple_x509_cl;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               DCF789451D88CD7C00E694BB /* PBXContainerItemProxy */ = {
+               DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCF788AB1D88CD2400E694BB;
-                       remoteInfo = security_apple_x509_tp;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               E74583BD1BF66489001B54A4 /* PBXContainerItemProxy */ = {
+               DC3502CD1E020E2200BC0587 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
-                       remoteInfo = CloudKeychainProxy;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               E745846C1BF68ECB001B54A4 /* PBXContainerItemProxy */ = {
+               DC3502D41E02117600BC0587 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 05EF68BB194915A5007958C3;
-                       remoteInfo = Security_executables;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               E745846E1BF68ECB001B54A4 /* PBXContainerItemProxy */ = {
+               DC391FA221C03F8D00772585 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 05EF68C1194915FB007958C3;
-                       remoteInfo = Security_kexts;
+                       remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
+                       remoteInfo = otctl;

                };
                };

-               E74584701BF68ECB001B54A4 /* PBXContainerItemProxy */ = {
+               DC3A4B6A1D91EBEE00E46D4A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 05EF68AF1949149C007958C3;
-                       remoteInfo = Security_temporary_UI;
+                       remoteGlobalIDString = DC3A4B571D91E9FB00E46D4A;
+                       remoteInfo = CodeSigningHelper;

                };
                };

-               E79EEDD61CD3F9F800C2FBFC /* PBXContainerItemProxy */ = {
+               DC3E18C9212501C200073D80 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C7CFA2E14E1BA4800DF9D95;
-                       remoteInfo = Security_frameworks_ios;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               E79EEDDE1CD3FFEA00C2FBFC /* PBXContainerItemProxy */ = {
+               DC3E18CB2125020400073D80 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E79EEDD81CD3FFC800C2FBFC;
-                       remoteInfo = Security_frameworks_macos;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               E79EEDE41CD4001300C2FBFC /* PBXContainerItemProxy */ = {
+               DC3E18CD2125024C00073D80 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 05EF68BB194915A5007958C3;
-                       remoteInfo = Security_executables_macos;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               E79EEDE61CD4003900C2FBFC /* PBXContainerItemProxy */ = {
+               DC3E18E72125F9EF00073D80 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E79EEDD81CD3FFC800C2FBFC;
-                       remoteInfo = Security_frameworks_macos;
+                       remoteGlobalIDString = DC36895D21235F42003A3735;
+                       remoteInfo = aks_mock;

                };
                };

-               E7CFF6701C84F62900E3484E /* PBXContainerItemProxy */ = {
+               DC52E84A1D80BF1100B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
-                       remoteInfo = KeychainCircle;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd;

                };
                };

-               E7CFF6721C84F62900E3484E /* PBXContainerItemProxy */ = {
+               DC52EC3C1D80CFF000B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7D847CD1C6BE9720025BB44;
-                       remoteInfo = KeychainCircleTests;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = libSOSCommands;

                };
                };

-               E7CFF6741C84F65D00E3484E /* PBXContainerItemProxy */ = {
+               DC52EC501D80D03100B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7CFF6471C84F61200E3484E;
-                       remoteInfo = Security_KeychainCircle;
+                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
+                       remoteInfo = libSWCAgent;

                };
                };

-               E7CFF6761C84F66A00E3484E /* PBXContainerItemProxy */ = {
+               DC52EC5E1D80D08100B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7CFF6471C84F61200E3484E;
-                       remoteInfo = Security_KeychainCircle;
+                       remoteGlobalIDString = DC52EC521D80D05200B0A59C;
+                       remoteInfo = liblogging;

                };
                };

-               E7D847D01C6BE9720025BB44 /* PBXContainerItemProxy */ = {
+               DC52EC7C1D80D18800B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
-                       remoteInfo = KeychainCircle;
+                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
+                       remoteInfo = libSOSRegressions;

                };
                };

-               EB0D30F91EF12BFB00C3C17D /* PBXContainerItemProxy */ = {
+               DC52ECEB1D80D34C00B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E79EEDD21CD3F8AB00C2FBFC;
-                       remoteInfo = Security_tests_ios;
+                       remoteGlobalIDString = DC52EC7E1D80D1A800B0A59C;
+                       remoteInfo = libSecurityRegressions;

                };
                };

-               EB10557C1E14DFB60003C309 /* PBXContainerItemProxy */ = {
+               DC52EDA21D80D55300B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB1055741E14DF430003C309;
-                       remoteInfo = SecCertificateFuzzer;
+                       remoteGlobalIDString = DC52ED631D80D4CD00B0A59C;
+                       remoteInfo = libiOSsecuritydRegressions;

                };
                };

-               EB10557E1E14DFBE0003C309 /* PBXContainerItemProxy */ = {
+               DC52EDFB1D80D67C00B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB1055741E14DF430003C309;
-                       remoteInfo = SecCertificateFuzzer;
+                       remoteGlobalIDString = DC52EDA61D80D58400B0A59C;
+                       remoteInfo = libsecdRegressions;

                };
                };

-               EB108F201E6CE4D2003B0456 /* PBXContainerItemProxy */ = {
+               DC52EE621D80D7D900B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
+                       remoteInfo = libSharedRegressions;

                };
                };

-               EB11965920A6300600BFDA1B /* PBXContainerItemProxy */ = {
+               DC52EE641D80D7F000B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4809F7A42061B697003E72D0;
-                       remoteInfo = MultiPeerSimulatorTests;
+                       remoteGlobalIDString = DC52EDFD1D80D6DD00B0A59C;
+                       remoteInfo = libSharedRegressions;

                };
                };

-               EB11965B20A6301100BFDA1B /* PBXContainerItemProxy */ = {
+               DC52EE7D1D80D8B100B0A59C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4809F7A42061B697003E72D0;
-                       remoteInfo = MultiPeerSimulatorTests;
+                       remoteGlobalIDString = DC52EE661D80D82600B0A59C;
+                       remoteInfo = libSecItemShimOSX;

                };
                };

-               EB11965D20A6302100BFDA1B /* PBXContainerItemProxy */ = {
+               DC58C4421D77C1F8003C25A4 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4809F7A42061B697003E72D0;
-                       remoteInfo = MultiPeerSimulatorTests;
+                       remoteGlobalIDString = DC58C4221D77BDEA003C25A4;
+                       remoteInfo = csparser_osx;

                };
                };

-               EB1C4CA61E85883900404981 /* PBXContainerItemProxy */ = {
+               DC5ABE1B1D832F5E00CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
-                       remoteInfo = seckeychainnetworkextensionstest;
+                       remoteGlobalIDString = DC5ABDC41D832DAB00CF422C;
+                       remoteInfo = securitytool_macos;

                };
                };

-               EB1C4CA81E85883900404981 /* PBXContainerItemProxy */ = {
+               DC5AC0B41D83533400CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
-                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       proxyType = 2;
+                       remoteGlobalIDString = 189D4635166AC95C001D8533;
+                       remoteInfo = securityd_service;

                };
                };

-               EB1C4CAA1E85883900404981 /* PBXContainerItemProxy */ = {
+               DC5AC0B61D83533400CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
-                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       proxyType = 2;
+                       remoteGlobalIDString = 189D465B166C15C1001D8533;
+                       remoteInfo = securitydservicectrl;

                };
                };

-               EB1C4CB11E85884300404981 /* PBXContainerItemProxy */ = {
+               DC5AC0B81D83533400CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
-                       remoteInfo = seckeychainnetworkextensionstest;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       proxyType = 2;
+                       remoteGlobalIDString = 1843240E1714797D00196B52;
+                       remoteInfo = securitydservice_client;

                };
                };

-               EB1C4CB31E85884300404981 /* PBXContainerItemProxy */ = {
+               DC5AC0BA1D83533400CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       proxyType = 2;
+                       remoteGlobalIDString = 18F4808E17497521009724DB;
+                       remoteInfo = KeyStoreEvents;
+               };
+               DC5AC0BC1D83533E00CF422C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
-                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;
+                       remoteGlobalIDString = 1843240D1714797D00196B52;
+                       remoteInfo = securitydservice_client;

                };
                };

-               EB1C4CB51E85884300404981 /* PBXContainerItemProxy */ = {
+               DC5AC0BE1D83534300CF422C /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        isa = PBXContainerItemProxy;

-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;

                        proxyType = 1;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
-                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
+                       remoteGlobalIDString = 189D4634166AC95C001D8533;
+                       remoteInfo = securityd_service;

                };
                };

-               EB27FF251E40716D00EC9E3A /* PBXContainerItemProxy */ = {
+               DC6013362147222B00863C1A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
-                       remoteInfo = ckksctl;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               EB27FF271E40717400EC9E3A /* PBXContainerItemProxy */ = {
+               DC60133C214722C900863C1A /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
-                       remoteInfo = ckksctl;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               EB31EA821D3EF2FB008F952A /* PBXContainerItemProxy */ = {
+               DC6063AF21B0755D00069B82 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 5346480017331E1100FE9172;
-                       remoteInfo = KeychainSyncAccountNotification;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               EB3A8E001BEEC6F3001A89AA /* PBXContainerItemProxy */ = {
+               DC63CAF21D90DF6000C03317 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
-                       remoteInfo = secbackupntest;
+                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
+                       remoteInfo = libsecurityd_macos_mig;

                };
                };

-               EB425CD01C6585F1000ECE53 /* PBXContainerItemProxy */ = {
+               DC63CAF41D90DF6700C03317 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB425C9E1C65846D000ECE53;
-                       remoteInfo = secbackuptest;
+                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
+                       remoteInfo = libsecurityd_macos_mig;

                };
                };

-               EB433A2B1CC3252A00A7EACE /* PBXContainerItemProxy */ = {
+               DC63CAF61D90DF7000C03317 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB433A201CC3243600A7EACE;
-                       remoteInfo = secitemstresstest;
+                       remoteGlobalIDString = DC63CAE81D90D63500C03317;
+                       remoteInfo = libsecurityd_macos_mig;

                };
                };

-               EB58A05B1E74C517009C10D7 /* PBXContainerItemProxy */ = {
+               DC647C43208A85BE00D0F9F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E79EEDA71CD3F87B00C2FBFC;
-                       remoteInfo = Security_tests_osx;
+                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
+                       remoteInfo = TrustedPeers;

                };
                };

-               EB58A05D1E74C51F009C10D7 /* PBXContainerItemProxy */ = {
+               DC647C45208A85C900D0F9F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E79EEDD21CD3F8AB00C2FBFC;
-                       remoteInfo = Security_tests_ios;
+                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
+                       remoteInfo = TrustedPeers;

                };
                };

-               EB58A05F1E74C8D9009C10D7 /* PBXContainerItemProxy */ = {
+               DC647C47208A864800D0F9F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBB839A41E29665D00853BAC;
-                       remoteInfo = secfuzzer;
+                       remoteGlobalIDString = BEAA0040202B728B00E51F45;
+                       remoteInfo = Security_executables_Swift;

                };
                };

-               EB58A0611E74C8E4009C10D7 /* PBXContainerItemProxy */ = {
+               DC647C49208A865200D0F9F8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBB839A41E29665D00853BAC;
-                       remoteInfo = secfuzzer;
+                       remoteGlobalIDString = BEAA0040202B728B00E51F45;
+                       remoteInfo = Security_executables_Swift;

                };
                };

-               EB636BC920992D8900C1E21A /* PBXContainerItemProxy */ = {
+               DC65E7211D8CB27900152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
-                       remoteInfo = secdmockaks;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB636BD020992DA300C1E21A /* PBXContainerItemProxy */ = {
+               DC65E7251D8CB2E100152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
-                       remoteInfo = secdmockaks;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB636BD220992DB400C1E21A /* PBXContainerItemProxy */ = {
+               DC65E7281D8CB2F400152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
-                       remoteInfo = secdmockaks;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB636BD420992DC000C1E21A /* PBXContainerItemProxy */ = {
+               DC65E72B1D8CB31200152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB49B2AD202D877F003F34A0;
-                       remoteInfo = secdmockaks;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB63ADE01C3E74F900C45A69 /* PBXContainerItemProxy */ = {
+               DC65E72E1D8CB32400152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB0BC9361C3C791500785842;
-                       remoteInfo = secedumodetest;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB6A6FAC1B90F84D0045DC68 /* PBXContainerItemProxy */ = {
+               DC65E7381D8CB38300152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C7CFA2E14E1BA4800DF9D95;
-                       remoteInfo = Security_frameworks_ios;
+                       remoteGlobalIDString = DCB3417B1D8A2B860054D16E;
+                       remoteInfo = security_cdsa_utilities;

                };
                };

-               EB6A6FB81B90F8D70045DC68 /* PBXContainerItemProxy */ = {
+               DC65E73A1D8CB39300152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C541F840F250BF500E508AE;
-                       remoteInfo = Security_executables_ios;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;

                };
                };

-               EB6A6FBA1B90F8EC0045DC68 /* PBXContainerItemProxy */ = {
+               DC65E73D1D8CB3C100152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 0C7CFA2E14E1BA4800DF9D95;
-                       remoteInfo = Security_frameworks_ios;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EB6A6FBC1B90F9170045DC68 /* PBXContainerItemProxy */ = {
+               DC65E73F1D8CB3CD00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
-                       remoteInfo = Security;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EB8910F020E0287600DE533F /* PBXContainerItemProxy */ = {
+               DC65E7411D8CB3D400152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
-                       remoteInfo = secdxctests_ios;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               EB8910F720E0287E00DE533F /* PBXContainerItemProxy */ = {
+               DC65E7431D8CB3E000152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
-                       remoteInfo = secdxctests_ios;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               EB8910FD20E06DF500DE533F /* PBXContainerItemProxy */ = {
+               DC65E7451D8CB3E700152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
-                       remoteInfo = KeychainAnalyticsTests;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EB89FAFD20DBDAA800085498 /* PBXContainerItemProxy */ = {
+               DC65E7471D8CB3F000152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
-                       remoteInfo = seckeychainnetworkextensionstest;
+                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
+                       remoteInfo = security_ssl_regressions;

                };
                };

-               EB89FAFF20DBDAA800085498 /* PBXContainerItemProxy */ = {
+               DC65E7491D8CB3FE00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
-                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EB89FB0120DBDAA800085498 /* PBXContainerItemProxy */ = {
+               DC65E74B1D8CB40C00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
-                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
+                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
+                       remoteInfo = utilitiesRegressions;

                };
                };

-               EB9C1DB61BDFD51800F89272 /* PBXContainerItemProxy */ = {
+               DC65E74D1D8CB41E00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
-                       remoteInfo = SecurityBatsTests;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               EB9FE08C1BFBC48F004FEAAF /* PBXContainerItemProxy */ = {
+               DC65E74F1D8CB42700152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
-                       remoteInfo = SecurityBatsTests;
+                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
+                       remoteInfo = security_ssl_regressions;

                };
                };

-               EB9FE0B51BFBC499004FEAAF /* PBXContainerItemProxy */ = {
+               DC65E7511D8CB45300152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
-                       remoteInfo = SecurityBatsTests;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBA62C141EAD34C60096B33A /* PBXContainerItemProxy */ = {
+               DC65E7531D8CB46100152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
-                       remoteInfo = KeychainEntitledTestRunner;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EBA62C1B1EAD34CD0096B33A /* PBXContainerItemProxy */ = {
+               DC65E7551D8CB47600152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
-                       remoteInfo = KeychainEntitledTestRunner;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBA9AA881CE3E76C004E2B68 /* PBXContainerItemProxy */ = {
+               DC65E7571D8CB47D00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBA9AA7D1CE30E58004E2B68;
-                       remoteInfo = secitemnotifications;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EBB696D31BE2085700715F16 /* PBXContainerItemProxy */ = {
+               DC65E7591D8CB48900152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
-                       remoteInfo = secbackupntest;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               EBC15EA81BE29AC3001C0C5B /* PBXContainerItemProxy */ = {
+               DC65E75B1D8CB49200152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
-                       remoteInfo = SecurityBatsTests;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EBC73F51209A705A00AE3350 /* PBXContainerItemProxy */ = {
+               DC65E75D1D8CB49A00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
-                       remoteInfo = KeychainAnalyticsTests;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBC73F5C209A739600AE3350 /* PBXContainerItemProxy */ = {
+               DC65E75F1D8CB4A300152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
-                       remoteInfo = seckeychainnetworkextensionstest;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               EBC73F63209A73A100AE3350 /* PBXContainerItemProxy */ = {
+               DC65E7611D8CB4AA00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
-                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EBC73F65209A73A100AE3350 /* PBXContainerItemProxy */ = {
+               DC65E7631D8CB4B100152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
-                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBCE150F1FE638A2002E7CCC /* PBXContainerItemProxy */ = {
+               DC65E7651D8CB4C200152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB056E3D1FE5E390000A771E;
-                       remoteInfo = DeviceSimulator;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;

                };
                };

-               EBCF743E1CE593A700BED7CA /* PBXContainerItemProxy */ = {
+               DC65E7671D8CB4CB00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBCF73F31CE45F9C00BED7CA;
-                       remoteInfo = secitemfunctionality;
+                       remoteGlobalIDString = DCB343AD1D8A34FD0054D16E;
+                       remoteInfo = security_keychain_regressions;

                };
                };

-               EBD31B3A1E0A186500FBE9FA /* PBXContainerItemProxy */ = {
+               DC65E7691D8CB4D300152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5631D8B6E3D00070CB0;
-                       remoteInfo = XPCTimeStampingService;
+                       remoteGlobalIDString = DC0BCA131D8B82B000070CB0;
+                       remoteInfo = security_ssl_regressions;

                };
                };

-               EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */ = {
+               DC65E76B1D8CB4DF00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC5501D8B6D2D00070CB0;
-                       remoteInfo = XPCKeychainSandboxCheck;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBD849351B242C8900C5FD1E /* PBXContainerItemProxy */ = {
+               DC65E76D1D8CB4E600152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = 4CE5A54C09C796E100D27A3F;
-                       remoteInfo = sslViewer;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBF374811DC058B60065D840 /* PBXContainerItemProxy */ = {
+               DC65E76F1D8CB4ED00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBF374711DC055580065D840;
-                       remoteInfo = "security-sysdiagnose";
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBF374831DC058C00065D840 /* PBXContainerItemProxy */ = {
+               DC65E7711D8CB4F400152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBF374711DC055580065D840;
-                       remoteInfo = "security-sysdiagnose";
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBF374851DC058C50065D840 /* PBXContainerItemProxy */ = {
+               DC65E7731D8CB4FB00152EF0 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBF374711DC055580065D840;
-                       remoteInfo = "security-sysdiagnose";
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               EBF374871DC058CC0065D840 /* PBXContainerItemProxy */ = {
+               DC69A5822165295F00512BD6 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EBF374711DC055580065D840;
-                       remoteInfo = "security-sysdiagnose";
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               EBFBC2AF1E76582C00A34469 /* PBXContainerItemProxy */ = {
+               DC6BC2731D90D07800DD57B3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB108F181E6CE4D2003B0456;
-                       remoteInfo = KCPairingTests;
+                       remoteGlobalIDString = DC6BC26C1D90CFEF00DD57B3;
+                       remoteInfo = securityd_macos_startup_nomake;

                };
                };

-               EBFBC2B11E76585500A34469 /* PBXContainerItemProxy */ = {
+               DC6BC27A1D90D11C00DD57B3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = E7D847C41C6BE9710025BB44;
-                       remoteInfo = KeychainCircle;
+                       remoteGlobalIDString = DC6BC2751D90D0BE00DD57B3;
+                       remoteInfo = securityd_macos_DTrace_nomake;

                };
                };

-               EBFBC2B31E76586700A34469 /* PBXContainerItemProxy */ = {
+               DC6BC2811D90D30F00DD57B3 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = DC6BC27C1D90D1EE00DD57B3;
+                       remoteInfo = security_cssm_generator_nomake;

                };
                };

-               EBFBC2B51E76587800A34469 /* PBXContainerItemProxy */ = {
+               DC6D1C74208A547400AB21AF /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
+                       remoteInfo = Security;

                };
                };

-               EBFBC2B91E76588A00A34469 /* PBXContainerItemProxy */ = {
+               DC71D8E31D959C000065FB93 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;
+               };
+               DC71D8EA1D959C130065FB93 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               DC71DA021D95BDEA0065FB93 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };

-               EBFF18CD1F02BA66004E58FC /* PBXContainerItemProxy */ = {
+               DC71DA041D95BDF90065FB93 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = EB2D54A11F02A45E00E46890;
-                       remoteInfo = secatomicfile;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               EBFF18CF1F02C2FE004E58FC /* PBXContainerItemProxy */ = {
+               DC71DA061D95BE2F0065FB93 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BC8981D8B7CBD00070CB0;
-                       remoteInfo = security_filedb;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               F621D0821ED6ED5B000EA569 /* PBXContainerItemProxy */ = {
+               DC71DA0C1D95DD670065FB93 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = F621D0271ED6DCE7000EA569;
-                       remoteInfo = AuthorizationTestTool;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSync;

                };
                };

-               F667EC641E96EDCF00203D5C /* PBXContainerItemProxy */ = {
+               DC7FC45121EE9208003C39B8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
-                       remoteInfo = regressionBase;
+                       remoteGlobalIDString = DC7FC44721EE914C003C39B8;
+                       remoteInfo = FeatureFlagsPlist;

                };
                };

-               F667EC661E96FA4600203D5C /* PBXContainerItemProxy */ = {
+               DC7FC45321EE921A003C39B8 /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = F667EC561E96E9B100203D5C;
-                       remoteInfo = authdtest;
+                       remoteGlobalIDString = DC7FC44721EE914C003C39B8;
+                       remoteInfo = FeatureFlagsPlist;

                };
                };

-               F94E7AE11ACC8E7700F23132 /* PBXContainerItemProxy */ = {
+               DC82FFEA1D90D4640085674B /* PBXContainerItemProxy */ = {

                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;

-                       remoteGlobalIDString = F93C49021AB8FCE00047E01A;
-                       remoteInfo = ckcdiagnose.sh;
+                       remoteGlobalIDString = DC82FFE51D90D3F60085674B;
+                       remoteInfo = security_utilities_DTrace_nomake;

                };
                };

-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-               0C0BDB2D175685B000BC1A7E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DC82FFF11D90D54F0085674B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC82FFEC1D90D4D20085674B;
+                       remoteInfo = security_ocspd_macos_mig_nomake;

                };
                };

-               0C85DFFD1FB38BB6000343A7 /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                               0C85DFFE1FB38BB6000343A7 /* OCMock.framework in Embed OCMock */,
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               0C8BBF041FCB446400580909 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DC99B85D20EACA470065B73B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               0C9AEEB320783FBB00BF6237 /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DC99B86320EACA470065B73B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               0CF4064A2072E3E3003D6A7F /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DC99B86520EACA470065B73B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               3DD1FFD3201FF72C0086D049 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               3DD1FFD5201FF7860086D049 /* SecureTransport_iosTests.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCA232FB209A35840007B57D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = BEAA002A202A832500E51F45;
+                       remoteInfo = TrustedPeersHelper;

                };
                };

-               3DD1FFD6201FF7930086D049 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               3DD1FFD7201FF7B10086D049 /* SecureTransport_macosTests.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB332461F47857D00178C30 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = SOSCommands;

                };
                };

-               470415CD1E5E14B5001F3D95 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB340181D8A248C0054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = security_apple_asn1;

                };
                };

-               4718AE26205B39620068EC3F /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               4718AE27205B39620068EC3F /* com.apple.securityd.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB340891D8A25230054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB340661D8A24DF0054D16E;
+                       remoteInfo = security_apple_authorization;

                };
                };

-               4718AE28205B39620068EC3F /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Preferences/Logging/Subsystems;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               4718AE29205B39620068EC3F /* com.apple.securityd.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB3412D1D8A29830054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB3408E1D8A267C0054D16E;
+                       remoteInfo = security_cdsa_client;

                };
                };

-               47702B1C1E5F409700B29577 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB341781D8A2AF10054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB341301D8A2A010054D16E;
+                       remoteInfo = security_cdsa_plugin;

                };
                };

-               47702B2C1E5F492C00B29577 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB342361D8A2CD70054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB3417B1D8A2B860054D16E;
+                       remoteInfo = security_cdsa_utilities;

                };
                };

-               4814D8691CAA059E002FFC36 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Preferences/Logging/Subsystems;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC71D8F51D959F150065FB93 /* com.apple.securityd.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCB345651D8A36060054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB3423A1D8A32820054D16E;
+                       remoteInfo = security_keychain;

                };
                };

-               4C50AD081410673800EE92DE /* Copy DigiNotar Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigiNotar;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C50AD0C1410679000EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
-                               4C50AD0D1410679000EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
-                               4C50AD0E1410679000EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
-                               4C50AD0F1410679000EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
-                               4C50AD101410679000EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
-                               4C50AD111410679000EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD121410679000EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD131410679000EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD141410679000EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD151410679000EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91C91416ED7E00A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
-                               4C8B91CA1416ED7E00A254E2 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91CB1416ED7E00A254E2 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
-                               4C8B91CC1416ED7E00A254E2 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91CD1416ED7E00A254E2 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
-                               4C8B91CF1416ED7E00A254E2 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91D01416ED7E00A254E2 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91D11416ED7E00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
-                       );
-                       name = "Copy DigiNotar Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCB345B21D8A361F0054D16E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCB343AD1D8A34FD0054D16E;
+                       remoteInfo = security_keychain_regressions;

                };
                };

-               4C50AD091410675400EE92DE /* Copy DigiNotar-Entrust Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-Entrust";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C50AD181410679900EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD191410679900EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1A1410679900EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1B1410679900EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1C1410679900EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1D1410679900EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1E1410679900EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD1F1410679900EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD201410679900EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD211410679900EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD221410679900EE92DE /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D21416ED8E00A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D31416ED8E00A254E2 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D41416ED8E00A254E2 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D51416ED8E00A254E2 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D61416ED8E00A254E2 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D81416ED8E00A254E2 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91D91416ED8E00A254E2 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C8B91DA1416ED8E00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
-                       );
-                       name = "Copy DigiNotar-Entrust Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCBF4A8C21FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               4C50AD0A1410676300EE92DE /* Copy DigiNotar-ok Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-ok";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C50AD23141067A100EE92DE /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               4C8B91E41416ED9A00A254E2 /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD24141067A100EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD25141067A100EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD26141067A100EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD27141067A100EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD28141067A100EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD29141067A100EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD2A141067A100EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD2B141067A100EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD2C141067A100EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD2D141067A100EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C8B91DB1416ED9400A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
-                               4C8B91E31416ED9400A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD30141068C100EE92DE /* Expectations.plist in Copy DigiNotar-ok Resources */,
-                       );
-                       name = "Copy DigiNotar-ok Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCBF4A8E21FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               4C50AD3414106A2900EE92DE /* Copy DigiNotar Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigiNotar;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C50AD3914106A4E00EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
-                               4C50AD3A14106A4E00EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
-                               4C50AD3B14106A4E00EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
-                               4C50AD3C14106A4E00EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
-                               4C50AD3D14106A4E00EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
-                               4C50AD3E14106A4E00EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD3F14106A4E00EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD4014106A4E00EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD4114106A4E00EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
-                               4C50AD4214106A4E00EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
-                               4C3CECF41416E2EC00947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
-                               4C3CECF51416E2FA00947741 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
-                               4C3CECF61416E31A00947741 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
-                               4C3CECF81416E33500947741 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
-                               4C3CECF91416E34F00947741 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
-                               4C3CECFB1416E34F00947741 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
-                               4C3CECFC1416E34F00947741 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
-                               4C8B91C81416EBB500A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
-                       );
-                       name = "Copy DigiNotar Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCBF4A9021FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               4C50AD3514106A2B00EE92DE /* Copy DigiNotar-Entrust Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-Entrust";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C8B91C61416EB8B00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4614106A5000EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4714106A5000EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4814106A5000EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4914106A5000EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4A14106A5000EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4B14106A5000EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4C14106A5000EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4D14106A5000EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4E14106A5000EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD4F14106A5000EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C50AD5014106A5000EE92DE /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CECFD1416E35400947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CECFE1416E35400947741 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CECFF1416E35400947741 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CED001416E35400947741 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CED011416E35400947741 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CED031416E35400947741 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               4C3CED041416E35400947741 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                       );
-                       name = "Copy DigiNotar-Entrust Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCBF4A9221FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               4C50AD3614106A2C00EE92DE /* Copy DigiNotar-ok Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-ok";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               4C50AD5114106A5400EE92DE /* Expectations.plist in Copy DigiNotar-ok Resources */,
-                               4C50AD5214106A5400EE92DE /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               4C3CECF31416E25C00947741 /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5314106A5400EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5414106A5400EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5514106A5400EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5614106A5400EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5714106A5400EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5814106A5400EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5914106A5400EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5A14106A5400EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5B14106A5400EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C50AD5C14106A5400EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
-                               4C3CED051416E35A00947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
-                               4C8B91C71416EBA400A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
-                       );
-                       name = "Copy DigiNotar-ok Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCBF4A9421FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               4C52D0B216EFC61E0079966E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               4C52D0E916EFCCF80079966E /* com.apple.security.CircleJoinRequested.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCBF4A9621FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               5E11CAD919A759E2008A3664 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/bin;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               5E11CADA19A75A1F008A3664 /* KeychainItemsAclTest.sh in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCBF4A9821FFC82100539F0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               6C1520D31DCCF6F000C85C6D /* Install man8 page */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               6C1520D41DCCF71400C85C6D /* secd.8 in Install man8 page */,
-                       );
-                       name = "Install man8 page";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCC093771D80ABC300F984E4 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = libsecurity;

                };
                };

-               6C4F981E2075831300A3C5AB /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                               6C4F98252075833E00A3C5AB /* OCMock.framework in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCC5D6672087EDB300BBC127 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0EF8EE208697C600AB9E95;
+                       remoteInfo = tpctl;

                };
                };

-               6C9AA79C1F7C1D8F00D08296 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCC5D6692087EEE200BBC127 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = BEAA0040202B728B00E51F45;
+                       remoteInfo = Security_executables_Swift;

                };
                };

-               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;
+               DCC7A67A216435A40034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
+                       remoteInfo = security;

                };
                };

-               6CCDF7821E3C25FA003F2555 /* Copy BATS Test Discovery plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC7162D21EB413F2000D2BB5 /* KeychainCKKS.plist in Copy BATS Test Discovery plist */,
-                       );
-                       name = "Copy BATS Test Discovery plist";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCC7A67E216435B30034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               79679E231462023800CF997F /* Copy DigiCertMalaysia Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigicertMalaysia;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               79679E29146202A800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigiCertMalaysia Resources */,
-                               7947431E1462151E00D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */,
-                               79679E2A146202A800CF997F /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */,
-                               7947431A146213DC00D638A3 /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */,
-                       );
-                       name = "Copy DigiCertMalaysia Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCC7A681216446D30034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               79679E2B146202BC00CF997F /* Copy DigicertMalaysia Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigicertMalaysia;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               79679E2C146202CB00CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigicertMalaysia Resources */,
-                               7947431D1462151400D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigicertMalaysia Resources */,
-                               79679E2D146202CB00CF997F /* Invalid-webmail.jaring.my.crt in Copy DigicertMalaysia Resources */,
-                               7947431B146213EF00D638A3 /* Invalid-www.cybersecurity.my.crt in Copy DigicertMalaysia Resources */,
-                       );
-                       name = "Copy DigicertMalaysia Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCC7A683216446D90034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;

                };
                };

-               79863B6C0CADCE4300818B0D /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE809F31D9342BE00F91177 /* com.apple.securityd.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCC7A685216446E50034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;

                };
                };

-               BE442BBA18B7FDB800F24DAE /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               BE4AC9AE18B7FFC800B84964 /* com.apple.security.swcagent.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCC7A687216446EB0034967D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               BEB463AD1E64F3C1008EB77E /* Copy Sandbox */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Sandbox/Profiles;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               D4AA64361E95D92600D317ED /* com.apple.trustd.sb in Copy Sandbox */,
-                       );
-                       name = "Copy Sandbox";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD067821D8CDF58007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
+                       remoteInfo = codesigning_DTrace;

                };
                };

-               CDB9FCAA179CD054000AAD66 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Frameworks/Security.framework/CircleJoinRequested;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               CDB9FCAB179CD098000AAD66 /* Info.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD067841D8CDF5C007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
+                       remoteInfo = codesigning_SystemPolicy;

                };
                };

-               D41257CD1E9410A300781F23 /* Copy LaunchDaemon */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               D41257EF1E941E4E00781F23 /* com.apple.trustd.plist in Copy LaunchDaemon */,
-                       );
-                       name = "Copy LaunchDaemon";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD069711D8CE21C007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
+                       remoteInfo = codesigning_SystemPolicy;

                };
                };

-               D4ADA3111E2B209C0031CEA3 /* Install man8 page */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               D4AA643E1E95D94400D317ED /* trustd.8 in Install man8 page */,
-                       );
-                       name = "Install man8 page";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD069731D8CE21C007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
+                       remoteInfo = codesigning_DTrace;

                };
                };

-               DC0BC5C41D8B72E700070CB0 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A441D8CE281007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD0675B1D8CDD6D007602F1;
+                       remoteInfo = codesigning_SystemPolicy;

                };
                };

-               DC0BC5DD1D8B73B000070CB0 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A461D8CE281007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD067561D8CDCF3007602F1;
+                       remoteInfo = codesigning_DTrace;

                };
                };

-               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;
+               DCD06A7F1D8CE33B007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD067781D8CDF19007602F1;
+                       remoteInfo = security_codesigning;

                };
                };

-               DC3A4B681D91EB1700E46D4A /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Sandbox/Profiles;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC3A4B691D91EB1F00E46D4A /* com.apple.CodeSigningHelper.sb in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A811D8CE33F007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD0696F1D8CE21C007602F1;
+                       remoteInfo = integrity;

                };
                };

-               DC5ABDC31D832DAB00CF422C /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC5ABE1A1D832F3E00CF422C /* security.1 in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A831D8CE343007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD06A421D8CE281007602F1;
+                       remoteInfo = codehost;

                };
                };

-               DC5AC04E1D8352D900CF422C /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC5AC0C01D83538000CF422C /* securityd.1 in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A851D8CE348007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD069661D8CE105007602F1;
+                       remoteInfo = codesigning_RequirementsLanguage;

                };
                };

-               DC610A301D78F129002223DE /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A871D8CE34D007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD06A541D8CE2D5007602F1;
+                       remoteInfo = gkunpack;

                };
                };

-               DC610A451D78F48F002223DE /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06A891D8CE356007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD067781D8CDF19007602F1;
+                       remoteInfo = security_codesigning;

                };
                };

-               DC610A5B1D78F9D2002223DE /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /AppleInternal/CoreOS/codesign_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC610A651D78FA5B002223DE /* CaspianTests in CopyFiles */,
-                               DC610A661D78FA5B002223DE /* LocalCaspianTestRun.sh in CopyFiles */,
-                               DC610A691D78FA8C002223DE /* teamid.sh in CopyFiles */,
-                               DC610A6A1D78FA8C002223DE /* validation.sh in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD06BCE1D8E0F01007602F1 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD06AA91D8E0D53007602F1;
+                       remoteInfo = security_utilities;

                };
                };

-               DC610AB31D7910C3002223DE /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D661D8CC387001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC601D80D0C400B0A59C;
+                       remoteInfo = SOSRegressions;

                };
                };

-               DC6BC2711D90D04900DD57B3 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC6BC2721D90D05900DD57B3 /* com.apple.securityd.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D681D8CC3A6001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCCF41D8C694700070CB0;
+                       remoteInfo = utilitiesRegressions;

                };
                };

-               DC7162D41EB4154D000D2BB5 /* Copy BATS Test Discovery Plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCC19F711EB9151B00B7D70F /* KeychainCKKS.plist in Copy BATS Test Discovery Plist */,
-                       );
-                       name = "Copy BATS Test Discovery Plist";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D7A1D8CCA07001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BC9C81D8B824700070CB0;
+                       remoteInfo = security_ssl;

                };
                };

-               DC963E7D1D95EBA8008A153E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceVersions;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC963E7E1D95EBB1008A153E /* libsecurity_apple_csp.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D7C1D8CCA18001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1;

                };
                };

-               DC963E7F1D95EBC2008A153E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceLicenses;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC963E801D95EBD1008A153E /* libsecurity_apple_csp.txt in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D7E1D8CCA2C001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;

                };
                };

-               DC963E811D95EC04008A153E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceVersions;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC963E821D95EC1C008A153E /* libsecurity_codesigning.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D811D8CCB5A001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
+                       remoteInfo = libsecurityd_ios;

                };
                };

-               DC963E831D95EC20008A153E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/OpenSourceLicenses;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DC963E841D95EC31008A153E /* libsecurity_codesigning.txt in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD22D831D8CCB72001C9B81 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSync;

                };
                };

-               DC9A2C791EB40A64008FAC27 /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                               DC9A2C7F1EB40A76008FAC27 /* OCMock.framework in Embed OCMock */,
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCD66DC21D82056C00DB1393 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD66D5E1D8204A700DB1393;
+                       remoteInfo = libSecTrustOSX;

                };
                };

-               DCD0676D1D8CDEC1007602F1 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/bin;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCD067731D8CDEE0007602F1 /* gkrecord in CopyFiles */,
-                               DCD067721D8CDEDC007602F1 /* gkgenerate in CopyFiles */,
-                               DCD067711D8CDED9007602F1 /* gkclear in CopyFiles */,
-                               DCD067701D8CDED5007602F1 /* gklist in CopyFiles */,
-                               DCD0676F1D8CDED1007602F1 /* gkhandmake in CopyFiles */,
-                               DCD0676E1D8CDECD007602F1 /* gkmerge in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD66DC41D8205C400DB1393;
+                       remoteInfo = libSecOtrOSX;

                };
                };

-               DCD067741D8CDEE2007602F1 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/libexec;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCD067751D8CDEF2007602F1 /* gkreport in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD6BF5721E919820015F7A8 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DCD067761D8CDEF9007602F1 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCD067771D8CDF02007602F1 /* com.apple.gkreport.plist in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD6BF5921E919A60015F7A8 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DCE4E6A51D7A388C00AFB96E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/share/man/man1;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E6A81D7A38C400AFB96E /* security2.1 in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD6BF5D21E919E10015F7A8 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DCE4E7711D7A43B500AFB96E /* Copy DigiNotar Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigiNotar;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               DCE4E7721D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
-                               DCE4E7731D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
-                               DCE4E7741D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
-                               DCE4E7751D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
-                               DCE4E7761D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
-                               DCE4E7771D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E7781D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E7791D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E77A1D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E77B1D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E77C1D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
-                               DCE4E77D1D7A43B500AFB96E /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E77E1D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
-                               DCE4E77F1D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E7801D7A43B500AFB96E /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
-                               DCE4E7811D7A43B500AFB96E /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E7821D7A43B500AFB96E /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
-                               DCE4E7831D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
-                       );
-                       name = "Copy DigiNotar Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCD8A19B1E09EEA200E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E7841D7A43B500AFB96E /* Copy DigiNotar-Entrust Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-Entrust";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               DCE4E7851D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7861D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7871D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7881D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7891D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78A1D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78B1D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78C1D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78D1D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78E1D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E78F1D7A43B500AFB96E /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7901D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7911D7A43B500AFB96E /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7921D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7931D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7941D7A43B500AFB96E /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7951D7A43B500AFB96E /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7961D7A43B500AFB96E /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
-                               DCE4E7971D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
-                       );
-                       name = "Copy DigiNotar-Entrust Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCD8A1E51E09F81300E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E7981D7A43B500AFB96E /* Copy DigiNotar-ok Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "DigiNotar-ok";
-                       dstSubfolderSpec = 7;
-                       files = (
-                               DCE4E7991D7A43B500AFB96E /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79A1D7A43B500AFB96E /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79B1D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79C1D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79D1D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79E1D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E79F1D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A01D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A11D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A21D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A31D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A41D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A51D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A61D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
-                               DCE4E7A71D7A43B500AFB96E /* Expectations.plist in Copy DigiNotar-ok Resources */,
-                       );
-                       name = "Copy DigiNotar-ok Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCD8A1E81E09F85B00E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E7A81D7A43B500AFB96E /* Copy DigiCertMalaysia Resources */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = DigicertMalaysia;
-                       dstSubfolderSpec = 7;
-                       files = (
-                               DCE4E7A91D7A43B500AFB96E /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigiCertMalaysia Resources */,
-                               DCE4E7AA1D7A43B500AFB96E /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */,
-                               DCE4E7AB1D7A43B500AFB96E /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */,
-                               DCE4E7AC1D7A43B500AFB96E /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */,
-                       );
-                       name = "Copy DigiCertMalaysia Resources";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCD8A1EB1E09F88400E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E7F41D7A4DA800AFB96E /* Copy LaunchAgents files */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /System/Library/LaunchAgents;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E80A1D7A4E1D00AFB96E /* com.apple.secd.plist in Copy LaunchAgents files */,
-                       );
-                       name = "Copy LaunchAgents files";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A1EE1E09F8BC00E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E80B1D7A4E2900AFB96E /* Copy Logging Files */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Preferences/Logging/Subsystems;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E80E1D7A4E3B00AFB96E /* com.apple.securityd.plist in Copy Logging Files */,
-                       );
-                       name = "Copy Logging Files";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A1F11E09F8DB00E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E8521D7A57AE00AFB96E /* Copy LaunchAgent */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /System/Library/LaunchAgents;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               D4AA643D1E95D93900D317ED /* com.apple.trustd.agent.plist in Copy LaunchAgent */,
-                       );
-                       name = "Copy LaunchAgent";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A1F41E09F91F00E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E8541D7A57AE00AFB96E /* Copy LaunchDaemon Files */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchDaemons;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               D4AA643C1E95D93100D317ED /* com.apple.trustd.plist in Copy LaunchDaemon Files */,
-                       );
-                       name = "Copy LaunchDaemon Files";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A1FA1E09F99700E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E8CC1D7F358C00AFB96E /* Copy authorization.plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = "$(SYSTEM_LIBRARY_DIR)/Security";
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E8CD1D7F359F00AFB96E /* authorization.plist in Copy authorization.plist */,
-                       );
-                       name = "Copy authorization.plist";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A1FD1E09FA1800E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E8CE1D7F35A300AFB96E /* Copy sandbox profile */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = "$(SYSTEM_LIBRARY_DIR)/Sandbox/Profiles";
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E8D01D7F35BB00AFB96E /* com.apple.authd.sb in Copy sandbox profile */,
-                       );
-                       name = "Copy sandbox profile";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCD8A2021E09FAE500E4FA0A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;

                };
                };

-               DCE4E8D11D7F35C400AFB96E /* Copy asl module */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /private/etc/asl;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E8D31D7F35D800AFB96E /* com.apple.authd in Copy asl module */,
-                       );
-                       name = "Copy asl module";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCDA5E572124B9DC009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC311E6E2124B8A8002F5EAE;
+                       remoteInfo = aks_real_witness;

                };
                };

-               DCE4E8D41D7F360C00AFB96E /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/local/include;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E8D61D7F361F00AFB96E /* authd_private.h in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCDA5E592124BA2F009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DCE4E9701D7F3EA700AFB96E /* Install launchd plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/LaunchAgents;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               DCE4E9711D7F3EBB00AFB96E /* com.apple.security.keychain-circle-notification.plist in Install launchd plist */,
-                       );
-                       name = "Install launchd plist";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCDA5E5B2124BA54009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               DCF7F5D11F69AC28001042E9 /* Copy SecureObjectSync Headers */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = PrivateHeaders/SecureObjectSync;
-                       dstSubfolderSpec = 1;
-                       files = (
-                               DC3C72EF1D83778B00F6A832 /* SOSCloudCircleInternal.h in Copy SecureObjectSync Headers */,
-                               DC3C72EE1D83778600F6A832 /* SOSTypes.h in Copy SecureObjectSync Headers */,
-                               DC3C72ED1D83778100F6A832 /* SOSViews.h in Copy SecureObjectSync Headers */,
-                               DC3C72EC1D83777B00F6A832 /* SOSPeerInfo.h in Copy SecureObjectSync Headers */,
-                               DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */,
-                               DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */,
-                       );
-                       name = "Copy SecureObjectSync Headers";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCDA5E5D2124BA79009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               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;
+               DCDA5E612124BAD7009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               E7CFF7211C86602B00E3484E /* Install BATS Tests */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               E7EBDEBC1C87C0DB001BAA62 /* KeychainCircle.plist in Install BATS Tests */,
-                       );
-                       name = "Install BATS Tests";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCDA5E632124BCA9009B11B2 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;

                };
                };

-               EB1055801E14DFE40003C309 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = "$(SECURITY_FUZZER_BASE_DIR)/data/$(TARGET_NAME)";
-                       dstSubfolderSpec = 0;
-                       files = (
-                               EB1055831E14E1F90003C309 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in CopyFiles */,
-                               EB1055841E14E1F90003C309 /* Invalid-www.cybersecurity.my.crt in CopyFiles */,
-                               EB1055851E14E1F90003C309 /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in CopyFiles */,
-                               EB1055861E14E1F90003C309 /* Invalid-webmail.jaring.my.crt in CopyFiles */,
-                               EB1055871E14E2060003C309 /* DigiNotar_Root_CA_G2-RootCertificate.crt in CopyFiles */,
-                               EB1055881E14E2060003C309 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in CopyFiles */,
-                               EB1055891E14E2060003C309 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in CopyFiles */,
-                               EB10558A1E14E2060003C309 /* Invalid-diginotarpkioverheidcaoverheid.crt in CopyFiles */,
-                               EB10558B1E14E2060003C309 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in CopyFiles */,
-                               EB10558C1E14E2060003C309 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in CopyFiles */,
-                               EB10558D1E14E2060003C309 /* Ministerie_van_Defensie_Certificatie_Autoriteit.crt in CopyFiles */,
-                               EB10558E1E14E2060003C309 /* staatdernederlandenorganisatieca-g2-Cert.crt in CopyFiles */,
-                               EB10558F1E14E2060003C309 /* staatdernederlandenoverheidca-Cert.crt in CopyFiles */,
-                               EB1055901E14E2060003C309 /* Invalid-webmail.portofamsterdam.nl.crt in CopyFiles */,
-                               EB1055921E14E2060003C309 /* DigiNotarCA2007RootCertificate.crt in CopyFiles */,
-                               EB1055931E14E2060003C309 /* Invalid-asterisk.google.com.crt in CopyFiles */,
-                               EB1055941E14E2060003C309 /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in CopyFiles */,
-                               EB1055951E14E2060003C309 /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in CopyFiles */,
-                               EB1055961E14E2060003C309 /* Invalid-www.maestre.com-diginotal.extended.validation.crt in CopyFiles */,
-                               EB1055971E14E2060003C309 /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in CopyFiles */,
-                               EB1055981E14E2060003C309 /* diginotar-public-ca-2025-Cert.crt in CopyFiles */,
-                               EB1055991E14E2060003C309 /* diginotar-services-1024-entrust-secure-server-Cert.crt in CopyFiles */,
-                               EB10559A1E14E2060003C309 /* diginotar-services-diginotar-root-Cert.crt in CopyFiles */,
-                               EB10559B1E14E2060003C309 /* diginotar.cyberca-gte.global.root-Cert.crt in CopyFiles */,
-                               EB10559C1E14E2060003C309 /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in CopyFiles */,
-                               EB10559D1E14E2060003C309 /* diginotar.root.ca-entrust-secure-server-Cert.crt in CopyFiles */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCE27860245B81BD00381FE8 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4771D971209A755800BA9772;
+                       remoteInfo = KeychainDataclassOwner;

                };
                };

-               EB27FF0F1E402CD300EC9E3A /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCE4E8931D7F34F600AFB96E;
+                       remoteInfo = authd;

                };
                };

-               EB76B7581DCB0C8B00C43FBC /* Install man8 page */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               EB76B7591DCB0CA200C43FBC /* CloudKeychainProxy.8 in Install man8 page */,
-                       );
-                       name = "Install man8 page";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC211D80CFB200B0A59C;
+                       remoteInfo = SOSCommands;

                };
                };

-               EB76B75B1DCB0DD500C43FBC /* Install man8 page */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /usr/share/man/man8;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               EB0DB37D1DCBC99100EAB6AE /* Keychain Circle Notification.8 in Install man8 page */,
-                       );
-                       name = "Install man8 page";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCF19A6D21AE2CDC002E808F /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 189D465A166C15C1001D8533;
+                       remoteInfo = securitydservicectrl;

                };
                };

-               EB9C1DB41BDFD4F200F89272 /* Install BATS plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               EB9C1DB51BDFD50100F89272 /* Security.plist in Install BATS plist */,
-                               EB3A8DFF1BEEC66F001A89AA /* Security_edumode.plist in Install BATS plist */,
-                               EB3D1FBA2092CB030049EF95 /* SecurityInduceLowDisk.plist in Install BATS plist */,
-                       );
-                       name = "Install BATS plist";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCF785001D88B80600E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF7830A1D88B4DE00E694BB;
+                       remoteInfo = security_apple_csp;

                };
                };

-               EBB839A31E29665D00853BAC /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCF787311D88C1B000E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF785021D88B95500E694BB;
+                       remoteInfo = security_apple_cspdl;

                };
                };

-               EBC15B1C1DB432E600126882 /* Copy Sandbox profile */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /System/Library/Sandbox/Profiles;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               EBC15B1D1DB432F800126882 /* com.apple.secd.sb in Copy Sandbox profile */,
-                       );
-                       name = "Copy Sandbox profile";
-                       runOnlyForDeploymentPostprocessing = 1;
+               DCF788451D88C98100E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF788341D88C8C400E694BB;
+                       remoteInfo = security_apple_filedl;

                };
                };

-               EBCE150D1FE63880002E7CCC /* Embedded XPC service */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
-                       dstSubfolderSpec = 16;
-                       files = (
-                               EBCE150E1FE6389A002E7CCC /* DeviceSimulator.xpc in Embedded XPC service */,
-                       );
-                       name = "Embedded XPC service";
-                       runOnlyForDeploymentPostprocessing = 0;
+               DCF788A31D88CB6000E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF788471D88CA7200E694BB;
+                       remoteInfo = security_apple_x509_cl;

                };
                };

-               EBF374701DC055580065D840 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1;
-                       dstSubfolderSpec = 0;
+               DCF788A81D88CC3500E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF788471D88CA7200E694BB;
+                       remoteInfo = security_apple_x509_cl;
+               };
+               DCF789451D88CD7C00E694BB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCF788AB1D88CD2400E694BB;
+                       remoteInfo = security_apple_x509_tp;
+               };
+               E060D1AA212478100025B833 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E060D1A62124780F0025B833;
+                       remoteInfo = OctagonTestHarnessXPCServiceProtocol;
+               };
+               E060D1B9212478120025B833 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E060D1B6212478110025B833;
+                       remoteInfo = OctagonTestHarnessXPCService;
+               };
+               E060D1BB212478120025B833 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E060D1A62124780F0025B833;
+                       remoteInfo = OctagonTestHarnessXPCServiceProtocol;
+               };
+               E74583BD1BF66489001B54A4 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 52D82BDD16A621F70078DFE5;
+                       remoteInfo = CloudKeychainProxy;
+               };
+               E745846C1BF68ECB001B54A4 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 05EF68BB194915A5007958C3;
+                       remoteInfo = Security_executables;
+               };
+               E79EEDE61CD4003900C2FBFC /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E79EEDD81CD3FFC800C2FBFC;
+                       remoteInfo = Security_frameworks_macos;
+               };
+               EB10557C1E14DFB60003C309 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB1055741E14DF430003C309;
+                       remoteInfo = SecCertificateFuzzer;
+               };
+               EB108F201E6CE4D2003B0456 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               EB1C4CB11E85884300404981 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 470415CE1E5E14B5001F3D95;
+                       remoteInfo = seckeychainnetworkextensionstest;
+               };
+               EB1C4CB31E85884300404981 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 47702B1D1E5F409700B29577;
+                       remoteInfo = seckeychainnetworkextensionsystemdaemontest;
+               };
+               EB1C4CB51E85884300404981 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 47702B2D1E5F492C00B29577;
+                       remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
+               };
+               EB27FF251E40716D00EC9E3A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
+                       remoteInfo = ckksctl;
+               };
+               EB27FF271E40717400EC9E3A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
+                       remoteInfo = ckksctl;
+               };
+               EB2ED4E822547DE900E98082 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB27FF101E402CD300EC9E3A;
+                       remoteInfo = ckksctl;
+               };
+               EB31EA821D3EF2FB008F952A /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 5346480017331E1100FE9172;
+                       remoteInfo = KeychainSyncAccountNotification;
+               };
+               EB3A8E001BEEC6F3001A89AA /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB9C1D791BDFD0E000F89272;
+                       remoteInfo = secbackupntest;
+               };
+               EB425CD01C6585F1000ECE53 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB425C9E1C65846D000ECE53;
+                       remoteInfo = secbackuptest;
+               };
+               EB433A2B1CC3252A00A7EACE /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB433A201CC3243600A7EACE;
+                       remoteInfo = secitemstresstest;
+               };
+               EB58A05B1E74C517009C10D7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E79EEDA71CD3F87B00C2FBFC;
+                       remoteInfo = Security_tests_osx;
+               };
+               EB58A05D1E74C51F009C10D7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E79EEDD21CD3F8AB00C2FBFC;
+                       remoteInfo = Security_tests_ios;
+               };
+               EB58A0611E74C8E4009C10D7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBB839A41E29665D00853BAC;
+                       remoteInfo = secfuzzer;
+               };
+               EB63ADE01C3E74F900C45A69 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB0BC9361C3C791500785842;
+                       remoteInfo = secedumodetest;
+               };
+               EB694DAE2239E59600F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;
+               };
+               EB694DC32239E5A200F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
+                       remoteInfo = KeychainEntitledTestRunner;
+               };
+               EB694DC72239E5F200F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 5EBE24791B00CCAE0007DB0E;
+                       remoteInfo = secacltests;
+               };
+               EB694DCD223A086C00F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;
+               };
+               EB694DCF223A087700F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C46056B1F882B9B001421B6;
+                       remoteInfo = KeychainAnalyticsTests;
+               };
+               EB694E71223AB78E00F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;
+               };
+               EB694E86223AB79400F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;
+               };
+               EB694E88223AB79B00F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;
+               };
+               EB694E8A223AB7A200F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC3502B41E0208BE00BC0587;
+                       remoteInfo = CKKSTests;
+               };
+               EB695280223B75C300F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;
+               };
+               EB695284223B75C300F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;
+               };
+               EB695286223B75C300F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;
+               };
+               EB695288223B75C300F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
+                       remoteInfo = libSWCAgent;
+               };
+               EB6952BA223B75FC00F02C1C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB69527E223B75C300F02C1C;
+                       remoteInfo = secitemd;
+               };
+               EB6A6FBA1B90F8EC0045DC68 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 0C7CFA2E14E1BA4800DF9D95;
+                       remoteInfo = Security_frameworks_ios;
+               };
+               EB6A6FBC1B90F9170045DC68 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
+                       remoteInfo = Security;
+               };
+               EB74CBD522077CC600F1BBAD /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
+               EB74CC222207E99700F1BBAD /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB74CC152207E48000F1BBAD;
+                       remoteInfo = KeychainSettings;
+               };
+               EB89085821F17D3C00F0DDDB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;
+               };
+               EB89085C21F17D3C00F0DDDB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = iOSutilities;
+               };
+               EB89085E21F17D3C00F0DDDB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;
+               };
+               EB89086621F17D3C00F0DDDB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52EC3E1D80D00800B0A59C;
+                       remoteInfo = libSWCAgent;
+               };
+               EB8908A121F17E3B00F0DDDB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EB89085621F17D3C00F0DDDB;
+                       remoteInfo = securityd_nerd;
+               };
+               EBA9AA881CE3E76C004E2B68 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBA9AA7D1CE30E58004E2B68;
+                       remoteInfo = secitemnotifications;
+               };
+               EBB8520F22F793A200424FD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBB851EB22F7912400424FD0;
+                       remoteInfo = SecurityUtilitiesTests;
+               };
+               EBB8521122F793AC00424FD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBB851EB22F7912400424FD0;
+                       remoteInfo = SecurityUtilitiesTests;
+               };
+               EBB8521522F793CF00424FD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBB851EB22F7912400424FD0;
+                       remoteInfo = SecurityUtilitiesTests;
+               };
+               EBB8521722F793EF00424FD0 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBB851EB22F7912400424FD0;
+                       remoteInfo = SecurityUtilitiesTests;
+               };
+               EBCF743E1CE593A700BED7CA /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBCF73F31CE45F9C00BED7CA;
+                       remoteInfo = secitemfunctionality;
+               };
+               EBD31B3A1E0A186500FBE9FA /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BC5631D8B6E3D00070CB0;
+                       remoteInfo = XPCTimeStampingService;
+               };
+               EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BC5501D8B6D2D00070CB0;
+                       remoteInfo = XPCKeychainSandboxCheck;
+               };
+               EBF374811DC058B60065D840 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBF374711DC055580065D840;
+                       remoteInfo = "security-sysdiagnose";
+               };
+               EBF374831DC058C00065D840 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBF374711DC055580065D840;
+                       remoteInfo = "security-sysdiagnose";
+               };
+               EBF374851DC058C50065D840 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBF374711DC055580065D840;
+                       remoteInfo = "security-sysdiagnose";
+               };
+               EBF374871DC058CC0065D840 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = EBF374711DC055580065D840;
+                       remoteInfo = "security-sysdiagnose";
+               };
+               EBFBC2B91E76588A00A34469 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
+                       remoteInfo = ASN1_not_installed;
+               };
+               EBFF18CF1F02C2FE004E58FC /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BC8981D8B7CBD00070CB0;
+                       remoteInfo = security_filedb;
+               };
+               F667EC641E96EDCF00203D5C /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCBD91D8C648C00070CB0;
+                       remoteInfo = regressionBase;
+               };
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+               0C0BDB2D175685B000BC1A7E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;

                        files = (
                        files = (

-                               EBF374801DC058070065D840 /* security-sysdiagnose.1 in CopyFiles */,

                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };

-               F667EC5C1E96E9B100203D5C /* CopyFiles */ = {
+               0C85DFFD1FB38BB6000343A7 /* Embed OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               0C85DFFE1FB38BB6000343A7 /* OCMock.framework in Embed OCMock */,
+                       );
+                       name = "Embed OCMock";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               0C8BBF041FCB446400580909 /* Install man1 pages */ = {

                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        dstPath = /usr/share/man/man1/;
                        dstSubfolderSpec = 0;
                        files = (
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                        dstPath = /usr/share/man/man1/;
                        dstSubfolderSpec = 0;
                        files = (

+                               EB1C319D2215ED3500A188BB /* otctl.1 in Install man1 pages */,

                        );
                        );

+                       name = "Install man1 pages";

                        runOnlyForDeploymentPostprocessing = 1;
                };
                        runOnlyForDeploymentPostprocessing = 1;
                };

-               F93C49061AB8FCE50047E01A /* CopyFiles */ = {
+               0C97867A235A766B0040A867 /* Copy System logging profile */ = {

                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;

-                       dstPath = /usr/local/sbin;
+                       dstPath = /System/Library/Preferences/Logging/Subsystems;

                        dstSubfolderSpec = 0;
                        files = (
                        dstSubfolderSpec = 0;
                        files = (

-                               F93C493B1AB8FF530047E01A /* ckcdiagnose.sh in CopyFiles */,
+                               0C97867D235A77230040A867 /* com.apple.security.signposts.plist in Copy System logging profile */,

                        );
                        );

+                       name = "Copy System logging profile";

                        runOnlyForDeploymentPostprocessing = 1;
                };
                        runOnlyForDeploymentPostprocessing = 1;
                };

-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-               091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RemoteServiceDiscovery.framework; path = System/Library/PrivateFrameworks/RemoteServiceDiscovery.framework; sourceTree = SDKROOT; };
-               09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecKeyProxy.h; path = keychain/SecKeyProxy.h; sourceTree = "<group>"; };
-               09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-proxy.m"; path = "OSX/shared_regressions/si-44-seckey-proxy.m"; sourceTree = SOURCE_ROOT; };
-               09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainEntitlementsTest.m; sourceTree = "<group>"; };
-               09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-fv.m"; path = "OSX/shared_regressions/si-44-seckey-fv.m"; sourceTree = SOURCE_ROOT; };
-               09E9991F1F7D76550018DF67 /* SecKeyProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecKeyProxy.m; sourceTree = "<group>"; };
-               0C0BDB2F175685B000BC1A7E /* secdtests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secdtests; sourceTree = BUILT_PRODUCTS_DIR; };
-               0C0BDB31175685B000BC1A7E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-               0C0BDB441756868B00BC1A7E /* testlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testlist.h; sourceTree = "<group>"; };
-               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>"; };
-               0C108C4B208A677100E8CF70 /* SFSignInAnalytics+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFSignInAnalytics+Internal.h"; 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>"; };
-               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>"; };
-               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; };
-               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>"; };
-               0C9AEEB720783FBB00BF6237 /* SignInAnalyticsTests_osx.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignInAnalyticsTests_osx.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               0C9FB40120D8729A00864612 /* CoreCDP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreCDP.framework; path = System/Library/PrivateFrameworks/CoreCDP.framework; sourceTree = SDKROOT; };
-               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>"; };
-               0CD8D654207D6E65005CDBE8 /* SFAnalytics+Signin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFAnalytics+Signin.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>"; };
-               0CE7604D1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SOSAccountTrustClassic+Retirement.m"; path = "SecureObjectSync/SOSAccountTrustClassic+Retirement.m"; sourceTree = "<group>"; };
-               0CE7604F1E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SOSAccountTrustClassic+Expansion.h"; path = "SecureObjectSync/SOSAccountTrustClassic+Expansion.h"; 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; };
-               0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFSignInAnalytics.m; sourceTree = "<group>"; };
-               0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFSignInAnalytics.h; sourceTree = "<group>"; };
-               0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFSignInAnalyticsTests.m; sourceTree = "<group>"; };
-               0CF405FC2072E352003D6A7F /* SFTMTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SFTMTests-Info.plist"; sourceTree = "<group>"; };
-               0CF406502072E3E3003D6A7F /* SignInAnalyticsTests_ios.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SignInAnalyticsTests_ios.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               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>"; };
-               107227350D91FE89003CF14F /* libbsm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbsm.dylib; path = usr/lib/libbsm.dylib; sourceTree = SDKROOT; };
-               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; };
-               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>"; };
-               3DD1FE78201AA50C0086D049 /* STLegacyTests+clientauth41.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+clientauth41.m"; sourceTree = "<group>"; };
-               3DD1FE79201AA50D0086D049 /* SecureTransport_macosTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SecureTransport_macosTests.plist; sourceTree = "<group>"; };
-               3DD1FE7A201AA50D0086D049 /* STLegacyTests-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "STLegacyTests-Entitlements.plist"; sourceTree = "<group>"; };
-               3DD1FE7B201AA50D0086D049 /* STLegacyTests+noconn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+noconn.m"; sourceTree = "<group>"; };
-               3DD1FE7C201AA50E0086D049 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               3DD1FE7D201AA50E0086D049 /* STLegacyTests+tls12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+tls12.m"; sourceTree = "<group>"; };
-               3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecureTransportTests.m; sourceTree = "<group>"; };
-               3DD1FE7F201AA50F0086D049 /* STLegacyTests+sni.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sni.m"; sourceTree = "<group>"; };
-               3DD1FE80201AA5100086D049 /* STLegacyTests+sessionstate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sessionstate.m"; sourceTree = "<group>"; };
-               3DD1FE81201AA5100086D049 /* STLegacyTests+sslciphers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sslciphers.m"; sourceTree = "<group>"; };
-               3DD1FE82201AA5110086D049 /* STLegacyTests+dhe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+dhe.m"; sourceTree = "<group>"; };
-               3DD1FE83201AA5110086D049 /* STLegacyTests+crashes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+crashes.m"; sourceTree = "<group>"; };
-               3DD1FE84201AA5120086D049 /* STLegacyTests+falsestart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+falsestart.m"; sourceTree = "<group>"; };
-               3DD1FE85201AA5120086D049 /* STLegacyTests+renegotiate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+renegotiate.m"; sourceTree = "<group>"; };
-               3DD1FE86201AA5120086D049 /* SecureTransport_iosTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SecureTransport_iosTests.plist; sourceTree = "<group>"; };
-               3DD1FE87201AA5130086D049 /* STLegacyTests+clientauth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+clientauth.m"; sourceTree = "<group>"; };
-               3DD1FE88201AA5130086D049 /* STLegacyTests+split.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+split.m"; sourceTree = "<group>"; };
-               3DD1FE89201AA5140086D049 /* STLegacyTests+ciphers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+ciphers.m"; sourceTree = "<group>"; };
-               3DD1FE8A201AA5140086D049 /* STLegacyTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STLegacyTests.h; sourceTree = "<group>"; };
-               3DD1FE8B201AA5150086D049 /* STLegacyTests+sessioncache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sessioncache.m"; sourceTree = "<group>"; };
-               3DD1FE8C201AA5150086D049 /* STLegacyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = STLegacyTests.m; sourceTree = "<group>"; };
-               3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureTransport_macos_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               3DD1FFA8201FC5C20086D049 /* libcoretls.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls.tbd; path = usr/lib/libcoretls.tbd; sourceTree = SDKROOT; };
-               3DD1FFA9201FC5C30086D049 /* libcoretls_cfhelpers.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls_cfhelpers.tbd; path = usr/lib/libcoretls_cfhelpers.tbd; sourceTree = SDKROOT; };
-               3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureTransport_ios_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               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; };
-               4381690F1B4EDCBD00C54D58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               438169E11B4EDEE200C54D58 /* SOSCCAuthPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCCAuthPlugin.h; sourceTree = "<group>"; };
-               438169E21B4EDEE200C54D58 /* SOSCCAuthPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSCCAuthPlugin.m; sourceTree = "<group>"; };
-               43DB542E1BB1F85B0083C3F1 /* ProtectedCloudStorage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtectedCloudStorage.framework; path = System/Library/PrivateFrameworks/ProtectedCloudStorage.framework; sourceTree = SDKROOT; };
-               4432AF6A1A01458F000958DC /* libcoreauthd_client.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libcoreauthd_client.a; path = usr/local/lib/libcoreauthd_client.a; sourceTree = SDKROOT; };
-               4432AF8C1A01472C000958DC /* libaks_acl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libaks_acl.a; path = usr/local/lib/libaks_acl.a; sourceTree = SDKROOT; };
-               443381D918A3D81400215606 /* SecAccessControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecAccessControl.h; path = ../../../keychain/SecAccessControl.h; sourceTree = "<group>"; };
-               443381DA18A3D81400215606 /* SecAccessControlPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControlPriv.h; sourceTree = "<group>"; };
-               4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_test.a; path = usr/local/lib/libctkclient_test.a; sourceTree = SDKROOT; };
-               4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_sep.a; path = usr/local/lib/libctkclient_sep.a; sourceTree = SDKROOT; };
-               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>"; };
-               470D966C1FCDE4BA0065FE90 /* KeychainModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = KeychainModel.xcdatamodel; sourceTree = "<group>"; };
-               470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecCDKeychain.h; sourceTree = "<group>"; };
-               470D96701FCDE55B0065FE90 /* SecCDKeychain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecCDKeychain.m; sourceTree = "<group>"; };
-               470D96841FCE34370065FE90 /* CDKeychainTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CDKeychainTests.m; sourceTree = "<group>"; };
-               471024D91E79CB6D00844C09 /* CKKSTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSTests.h; sourceTree = "<group>"; };
-               4718AE2D205B39620068EC3F /* securityd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityd; sourceTree = BUILT_PRODUCTS_DIR; };
-               4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_bridge.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               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; };
+               0CA378E623876DEC00090B7E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/bin;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               0CA378E723876DFC00090B7E /* reset_ick_account in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               3D58394821890FFB000ACA44 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               3DD1FFD3201FF72C0086D049 /* Copy Plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               3DD1FFD5201FF7860086D049 /* SecureTransport_iosTests.plist in Copy Plist */,
+                       );
+                       name = "Copy Plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               3DD1FFD6201FF7930086D049 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               3DD1FFD7201FF7B10086D049 /* SecureTransport_macosTests.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               470415CD1E5E14B5001F3D95 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               4718AE26205B39620068EC3F /* Launchd plists */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               4718AE27205B39620068EC3F /* com.apple.securityd.plist in Launchd plists */,
+                       );
+                       name = "Launchd plists";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               4718AE28205B39620068EC3F /* Copy Logging Files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Preferences/Logging/Subsystems;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               4718AE29205B39620068EC3F /* com.apple.securityd.plist in Copy Logging Files */,
+                       );
+                       name = "Copy Logging Files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               4718AEDC205B39C40068EC3F /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/AWD/Metadata;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               47702B1C1E5F409700B29577 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               47702B2C1E5F492C00B29577 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               4814D8691CAA059E002FFC36 /* Copy Logging Files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Preferences/Logging/Subsystems;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCDACB5A24A3F39A0054080C /* com.apple.security.ckks.plist in Copy Logging Files */,
+                               DC71D8F51D959F150065FB93 /* com.apple.securityd.plist in Copy Logging Files */,
+                       );
+                       name = "Copy Logging Files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               4C50AD081410673800EE92DE /* Copy DigiNotar Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigiNotar;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C50AD0C1410679000EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
+                               4C50AD0D1410679000EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
+                               4C50AD0E1410679000EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
+                               4C50AD0F1410679000EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
+                               4C50AD101410679000EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
+                               4C50AD111410679000EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD121410679000EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD131410679000EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD141410679000EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD151410679000EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91C91416ED7E00A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
+                               4C8B91CA1416ED7E00A254E2 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91CB1416ED7E00A254E2 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
+                               4C8B91CC1416ED7E00A254E2 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91CD1416ED7E00A254E2 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
+                               4C8B91CF1416ED7E00A254E2 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91D01416ED7E00A254E2 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91D11416ED7E00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
+                       );
+                       name = "Copy DigiNotar Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C50AD091410675400EE92DE /* Copy DigiNotar-Entrust Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-Entrust";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C50AD181410679900EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD191410679900EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1A1410679900EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1B1410679900EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1C1410679900EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1D1410679900EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1E1410679900EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD1F1410679900EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD201410679900EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD211410679900EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD221410679900EE92DE /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D21416ED8E00A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D31416ED8E00A254E2 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D41416ED8E00A254E2 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D51416ED8E00A254E2 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D61416ED8E00A254E2 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D81416ED8E00A254E2 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91D91416ED8E00A254E2 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C8B91DA1416ED8E00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
+                       );
+                       name = "Copy DigiNotar-Entrust Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C50AD0A1410676300EE92DE /* Copy DigiNotar-ok Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-ok";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C50AD23141067A100EE92DE /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               4C8B91E41416ED9A00A254E2 /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD24141067A100EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD25141067A100EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD26141067A100EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD27141067A100EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD28141067A100EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD29141067A100EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD2A141067A100EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD2B141067A100EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD2C141067A100EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD2D141067A100EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C8B91DB1416ED9400A254E2 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
+                               4C8B91E31416ED9400A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD30141068C100EE92DE /* Expectations.plist in Copy DigiNotar-ok Resources */,
+                       );
+                       name = "Copy DigiNotar-ok Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C50AD3414106A2900EE92DE /* Copy DigiNotar Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigiNotar;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C50AD3914106A4E00EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
+                               4C50AD3A14106A4E00EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
+                               4C50AD3B14106A4E00EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
+                               4C50AD3C14106A4E00EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
+                               4C50AD3D14106A4E00EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
+                               4C50AD3E14106A4E00EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD3F14106A4E00EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD4014106A4E00EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD4114106A4E00EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
+                               4C50AD4214106A4E00EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
+                               4C3CECF41416E2EC00947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
+                               4C3CECF51416E2FA00947741 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
+                               4C3CECF61416E31A00947741 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
+                               4C3CECF81416E33500947741 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
+                               4C3CECF91416E34F00947741 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
+                               4C3CECFB1416E34F00947741 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
+                               4C3CECFC1416E34F00947741 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
+                               4C8B91C81416EBB500A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
+                       );
+                       name = "Copy DigiNotar Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C50AD3514106A2B00EE92DE /* Copy DigiNotar-Entrust Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-Entrust";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C8B91C61416EB8B00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4614106A5000EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4714106A5000EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4814106A5000EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4914106A5000EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4A14106A5000EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4B14106A5000EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4C14106A5000EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4D14106A5000EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4E14106A5000EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD4F14106A5000EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C50AD5014106A5000EE92DE /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CECFD1416E35400947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CECFE1416E35400947741 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CECFF1416E35400947741 /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CED001416E35400947741 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CED011416E35400947741 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CED031416E35400947741 /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               4C3CED041416E35400947741 /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                       );
+                       name = "Copy DigiNotar-Entrust Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C50AD3614106A2C00EE92DE /* Copy DigiNotar-ok Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-ok";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               4C50AD5114106A5400EE92DE /* Expectations.plist in Copy DigiNotar-ok Resources */,
+                               4C50AD5214106A5400EE92DE /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               4C3CECF31416E25C00947741 /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5314106A5400EE92DE /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5414106A5400EE92DE /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5514106A5400EE92DE /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5614106A5400EE92DE /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5714106A5400EE92DE /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5814106A5400EE92DE /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5914106A5400EE92DE /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5A14106A5400EE92DE /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5B14106A5400EE92DE /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C50AD5C14106A5400EE92DE /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
+                               4C3CED051416E35A00947741 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
+                               4C8B91C71416EBA400A254E2 /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
+                       );
+                       name = "Copy DigiNotar-ok Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4C52D0B216EFC61E0079966E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               4C52D0E916EFCCF80079966E /* com.apple.security.CircleJoinRequested.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               5E11CAD919A759E2008A3664 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/bin;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               5E11CADA19A75A1F008A3664 /* KeychainItemsAclTest.sh in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6C1520D31DCCF6F000C85C6D /* Install man8 page */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               6C1520D41DCCF71400C85C6D /* secd.8 in Install man8 page */,
+                       );
+                       name = "Install man8 page";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6C2045F32424BBB900F9461D /* Install Sandbox Profile */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Sandbox/Profiles;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               6C2045F42424BBCD00F9461D /* com.apple.security.KeychainStasher.sb in Install Sandbox Profile */,
+                       );
+                       name = "Install Sandbox Profile";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6C2045FA2424BCC300F9461D /* Install LaunchAgent plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchAgents;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               6C2045FB2424BCD600F9461D /* com.apple.security.KeychainStasher.plist in Install LaunchAgent plist */,
+                       );
+                       name = "Install LaunchAgent plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6C23F02E227A39FD009F6756 /* Install Sandbox Profile */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Sandbox/Profiles;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               6C23F02F227A3A28009F6756 /* com.apple.securityd.sb in Install Sandbox Profile */,
+                       );
+                       name = "Install Sandbox Profile";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               6C4F981E2075831300A3C5AB /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               6C4F98252075833E00A3C5AB /* OCMock.framework in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               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;
+               };
+               79679E231462023800CF997F /* Copy DigiCertMalaysia Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigicertMalaysia;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               79679E29146202A800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigiCertMalaysia Resources */,
+                               7947431E1462151E00D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */,
+                               79679E2A146202A800CF997F /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */,
+                               7947431A146213DC00D638A3 /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */,
+                       );
+                       name = "Copy DigiCertMalaysia Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               79679E2B146202BC00CF997F /* Copy DigicertMalaysia Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigicertMalaysia;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               79679E2C146202CB00CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigicertMalaysia Resources */,
+                               7947431D1462151400D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigicertMalaysia Resources */,
+                               79679E2D146202CB00CF997F /* Invalid-webmail.jaring.my.crt in Copy DigicertMalaysia Resources */,
+                               7947431B146213EF00D638A3 /* Invalid-www.cybersecurity.my.crt in Copy DigicertMalaysia Resources */,
+                       );
+                       name = "Copy DigicertMalaysia Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               79863B6C0CADCE4300818B0D /* launchd plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE809F31D9342BE00F91177 /* com.apple.securityd.plist in launchd plist */,
+                       );
+                       name = "launchd plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               AA0DA47C21E818C1009F1C74 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               AA0DA47D21E818D2009F1C74 /* builtins.json in CopyFiles */,
+                               AA0DA47E21E818D2009F1C74 /* example1.json in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               AAE7D3202161CCE50054245E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 12;
+                       dstPath = "";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               AA0DA47A21E818AB009F1C74 /* builtins.json in CopyFiles */,
+                               AA0DA47B21E818AB009F1C74 /* example1.json in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               BE442BBA18B7FDB800F24DAE /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               BE4AC9AE18B7FFC800B84964 /* com.apple.security.swcagent.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               BEB463AD1E64F3C1008EB77E /* Copy Sandbox */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Sandbox/Profiles;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D4AA64361E95D92600D317ED /* com.apple.trustd.sb in Copy Sandbox */,
+                       );
+                       name = "Copy Sandbox";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               BECFA42C20F91AFE00B11002 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               CDB9FCAA179CD054000AAD66 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Frameworks/Security.framework/CircleJoinRequested;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               CDB9FCAB179CD098000AAD66 /* Info.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               D41257CD1E9410A300781F23 /* Copy LaunchDaemon */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D41257EF1E941E4E00781F23 /* com.apple.trustd.plist in Copy LaunchDaemon */,
+                       );
+                       name = "Copy LaunchDaemon";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               D43718C021168BD400EA350A /* Copy Open Source Version */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceVersions;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D43718C121168C4300EA350A /* libsecurity_cms.plist in Copy Open Source Version */,
+                       );
+                       name = "Copy Open Source Version";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               D43718C221168C5500EA350A /* Copy Open Source Licenses */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceLicenses;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D43718C321168C6D00EA350A /* libsecurity_cms.txt in Copy Open Source Licenses */,
+                       );
+                       name = "Copy Open Source Licenses";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               D4ADA3111E2B209C0031CEA3 /* Install man8 page */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D4AA643E1E95D94400D317ED /* trustd.8 in Install man8 page */,
+                       );
+                       name = "Install man8 page";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC05038021409A4F00A8EDB7 /* Embed OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               DC05038121409A6100A8EDB7 /* OCMock.framework in Embed OCMock */,
+                       );
+                       name = "Embed OCMock";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC0BC5C41D8B72E700070CB0 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC0BC5DD1D8B73B000070CB0 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC0EF8ED208697C600AB9E95 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC3A4B681D91EB1700E46D4A /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Sandbox/Profiles;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC3A4B691D91EB1F00E46D4A /* com.apple.CodeSigningHelper.sb in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC5ABDC31D832DAB00CF422C /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC5ABE1A1D832F3E00CF422C /* security.1 in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC5AC04E1D8352D900CF422C /* Man pages */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC5AC0C01D83538000CF422C /* securityd.1 in Man pages */,
+                       );
+                       name = "Man pages";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC610A301D78F129002223DE /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC610A451D78F48F002223DE /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC610A5B1D78F9D2002223DE /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /AppleInternal/CoreOS/codesign_tests;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC610A651D78FA5B002223DE /* CaspianTests in CopyFiles */,
+                               DC610A661D78FA5B002223DE /* LocalCaspianTestRun.sh in CopyFiles */,
+                               DC610A691D78FA8C002223DE /* teamid.sh in CopyFiles */,
+                               DC610A6A1D78FA8C002223DE /* validation.sh in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC610AB31D7910C3002223DE /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC6BC2711D90D04900DD57B3 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC6BC2721D90D05900DD57B3 /* com.apple.securityd.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC7FC44F21EE9175003C39B8 /* Install Security FeatureFlags plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/FeatureFlags/Domain;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC7FC45021EE917D003C39B8 /* Security.plist in Install Security FeatureFlags plist */,
+                       );
+                       name = "Install Security FeatureFlags plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC963E7D1D95EBA8008A153E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceVersions;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC963E7E1D95EBB1008A153E /* libsecurity_apple_csp.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC963E7F1D95EBC2008A153E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceLicenses;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC963E801D95EBD1008A153E /* libsecurity_apple_csp.txt in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC963E811D95EC04008A153E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceVersions;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC963E821D95EC1C008A153E /* libsecurity_codesigning.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC963E831D95EC20008A153E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/OpenSourceLicenses;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DC963E841D95EC31008A153E /* libsecurity_codesigning.txt in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DC9A2C791EB40A64008FAC27 /* Embed OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               DC9A2C7F1EB40A76008FAC27 /* OCMock.framework in Embed OCMock */,
+                       );
+                       name = "Embed OCMock";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCD0676D1D8CDEC1007602F1 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/bin;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCD067731D8CDEE0007602F1 /* gkrecord in CopyFiles */,
+                               DCD067721D8CDEDC007602F1 /* gkgenerate in CopyFiles */,
+                               DCD067711D8CDED9007602F1 /* gkclear in CopyFiles */,
+                               DCD067701D8CDED5007602F1 /* gklist in CopyFiles */,
+                               DCD0676F1D8CDED1007602F1 /* gkhandmake in CopyFiles */,
+                               DCD0676E1D8CDECD007602F1 /* gkmerge in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCD067741D8CDEE2007602F1 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/libexec;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCD067751D8CDEF2007602F1 /* gkreport in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCD067761D8CDEF9007602F1 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCD067771D8CDF02007602F1 /* com.apple.gkreport.plist in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E6A51D7A388C00AFB96E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/share/man/man1;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E6A81D7A38C400AFB96E /* security2.1 in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E7711D7A43B500AFB96E /* Copy DigiNotar Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigiNotar;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               DCE4E7721D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar Resources */,
+                               DCE4E7731D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar Resources */,
+                               DCE4E7741D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar Resources */,
+                               DCE4E7751D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar Resources */,
+                               DCE4E7761D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar Resources */,
+                               DCE4E7771D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E7781D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E7791D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E77A1D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E77B1D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E77C1D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar Resources */,
+                               DCE4E77D1D7A43B500AFB96E /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E77E1D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar Resources */,
+                               DCE4E77F1D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E7801D7A43B500AFB96E /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar Resources */,
+                               DCE4E7811D7A43B500AFB96E /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E7821D7A43B500AFB96E /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar Resources */,
+                               DCE4E7831D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar Resources */,
+                       );
+                       name = "Copy DigiNotar Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7841D7A43B500AFB96E /* Copy DigiNotar-Entrust Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-Entrust";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               DCE4E7851D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7861D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7871D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7881D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7891D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78A1D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78B1D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78C1D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78D1D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78E1D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E78F1D7A43B500AFB96E /* diginotar.root.ca-entrust-secure-server-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7901D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7911D7A43B500AFB96E /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7921D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheid.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7931D7A43B500AFB96E /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7941D7A43B500AFB96E /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7951D7A43B500AFB96E /* staatdernederlandenorganisatieca-g2-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7961D7A43B500AFB96E /* staatdernederlandenoverheidca-Cert.crt in Copy DigiNotar-Entrust Resources */,
+                               DCE4E7971D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-Entrust Resources */,
+                       );
+                       name = "Copy DigiNotar-Entrust Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7981D7A43B500AFB96E /* Copy DigiNotar-ok Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "DigiNotar-ok";
+                       dstSubfolderSpec = 7;
+                       files = (
+                               DCE4E7991D7A43B500AFB96E /* DigiNotarCA2007RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79A1D7A43B500AFB96E /* DigiNotar_Root_CA_G2-RootCertificate.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79B1D7A43B500AFB96E /* Invalid-asterisk.google.com.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79C1D7A43B500AFB96E /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79D1D7A43B500AFB96E /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79E1D7A43B500AFB96E /* Invalid-www.maestre.com-diginotal.extended.validation.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E79F1D7A43B500AFB96E /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A01D7A43B500AFB96E /* diginotar-public-ca-2025-Cert.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A11D7A43B500AFB96E /* diginotar-services-1024-entrust-secure-server-Cert.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A21D7A43B500AFB96E /* diginotar-services-diginotar-root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A31D7A43B500AFB96E /* diginotar.cyberca-gte.global.root-Cert.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A41D7A43B500AFB96E /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A51D7A43B500AFB96E /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A61D7A43B500AFB96E /* Invalid-webmail.portofamsterdam.nl.crt in Copy DigiNotar-ok Resources */,
+                               DCE4E7A71D7A43B500AFB96E /* Expectations.plist in Copy DigiNotar-ok Resources */,
+                       );
+                       name = "Copy DigiNotar-ok Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7A81D7A43B500AFB96E /* Copy DigiCertMalaysia Resources */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = DigicertMalaysia;
+                       dstSubfolderSpec = 7;
+                       files = (
+                               DCE4E7A91D7A43B500AFB96E /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in Copy DigiCertMalaysia Resources */,
+                               DCE4E7AA1D7A43B500AFB96E /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in Copy DigiCertMalaysia Resources */,
+                               DCE4E7AB1D7A43B500AFB96E /* Invalid-webmail.jaring.my.crt in Copy DigiCertMalaysia Resources */,
+                               DCE4E7AC1D7A43B500AFB96E /* Invalid-www.cybersecurity.my.crt in Copy DigiCertMalaysia Resources */,
+                       );
+                       name = "Copy DigiCertMalaysia Resources";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7F41D7A4DA800AFB96E /* Copy LaunchAgents files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /System/Library/LaunchAgents;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E80A1D7A4E1D00AFB96E /* com.apple.secd.plist in Copy LaunchAgents files */,
+                       );
+                       name = "Copy LaunchAgents files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E80B1D7A4E2900AFB96E /* Copy Logging Files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Preferences/Logging/Subsystems;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCDACB5924A3F38E0054080C /* com.apple.security.ckks.plist in Copy Logging Files */,
+                               DCE4E80E1D7A4E3B00AFB96E /* com.apple.securityd.plist in Copy Logging Files */,
+                       );
+                       name = "Copy Logging Files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8521D7A57AE00AFB96E /* Copy LaunchAgent */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /System/Library/LaunchAgents;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D4AA643D1E95D93900D317ED /* com.apple.trustd.agent.plist in Copy LaunchAgent */,
+                       );
+                       name = "Copy LaunchAgent";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8541D7A57AE00AFB96E /* Copy LaunchDaemon Files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               D4AA643C1E95D93100D317ED /* com.apple.trustd.plist in Copy LaunchDaemon Files */,
+                       );
+                       name = "Copy LaunchDaemon Files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8CC1D7F358C00AFB96E /* Copy authorization.plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = "$(SYSTEM_LIBRARY_DIR)/Security";
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E8CD1D7F359F00AFB96E /* authorization.plist in Copy authorization.plist */,
+                       );
+                       name = "Copy authorization.plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8CE1D7F35A300AFB96E /* Copy sandbox profile */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = "$(SYSTEM_LIBRARY_DIR)/Sandbox/Profiles";
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E8D01D7F35BB00AFB96E /* com.apple.authd.sb in Copy sandbox profile */,
+                       );
+                       name = "Copy sandbox profile";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8D11D7F35C400AFB96E /* Copy asl module */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /private/etc/asl;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E8D31D7F35D800AFB96E /* com.apple.authd in Copy asl module */,
+                       );
+                       name = "Copy asl module";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E8D41D7F360C00AFB96E /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/local/include;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E8D61D7F361F00AFB96E /* authd_private.h in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCE4E9701D7F3EA700AFB96E /* Install launchd plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchAgents;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               DCE4E9711D7F3EBB00AFB96E /* com.apple.security.keychain-circle-notification.plist in Install launchd plist */,
+                       );
+                       name = "Install launchd plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               DCF7F5D11F69AC28001042E9 /* Copy SecureObjectSync Headers */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = PrivateHeaders/SecureObjectSync;
+                       dstSubfolderSpec = 1;
+                       files = (
+                               DC3C72EF1D83778B00F6A832 /* SOSCloudCircleInternal.h in Copy SecureObjectSync Headers */,
+                               DC3C72EE1D83778600F6A832 /* SOSTypes.h in Copy SecureObjectSync Headers */,
+                               DC3C72ED1D83778100F6A832 /* SOSViews.h in Copy SecureObjectSync Headers */,
+                               DC3C72EC1D83777B00F6A832 /* SOSPeerInfo.h in Copy SecureObjectSync Headers */,
+                               DC3C72EB1D83777600F6A832 /* SOSCloudCircle.h in Copy SecureObjectSync Headers */,
+                               DC3C72E91D83776B00F6A832 /* SOSBackupSliceKeyBag.h in Copy SecureObjectSync Headers */,
+                       );
+                       name = "Copy SecureObjectSync Headers";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1D0212478120025B833 /* Embed Frameworks */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               E060D1A9212478100025B833 /* OctagonTestHarnessXPCServiceProtocol.framework in Embed Frameworks */,
+                       );
+                       name = "Embed Frameworks";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1D1212478120025B833 /* Embed XPC Services */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
+                       dstSubfolderSpec = 16;
+                       files = (
+                               E060D1B8212478120025B833 /* OctagonTestHarnessXPCService.xpc in Embed XPC Services */,
+                       );
+                       name = "Embed XPC Services";
+                       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;
+                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               E7EBDEBC1C87C0DB001BAA62 /* KeychainCircle.plist in Install BATS Tests */,
+                       );
+                       name = "Install BATS Tests";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB0F4A2B22F7D3BD009E855B /* Embedd OCMock */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               EB0F4A2C22F7D3DC009E855B /* OCMock.framework in Embedd OCMock */,
+                       );
+                       name = "Embedd OCMock";
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB1055801E14DFE40003C309 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = "$(SECURITY_FUZZER_BASE_DIR)/data/$(TARGET_NAME)";
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB1055831E14E1F90003C309 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt in CopyFiles */,
+                               EB1055841E14E1F90003C309 /* Invalid-www.cybersecurity.my.crt in CopyFiles */,
+                               EB1055851E14E1F90003C309 /* Digisign-Server-ID-Enrich-Entrust-Cert.crt in CopyFiles */,
+                               EB1055861E14E1F90003C309 /* Invalid-webmail.jaring.my.crt in CopyFiles */,
+                               EB1055871E14E2060003C309 /* DigiNotar_Root_CA_G2-RootCertificate.crt in CopyFiles */,
+                               EB1055881E14E2060003C309 /* Invalid-CertiID_Enterprise_Certificate_Authority.crt in CopyFiles */,
+                               EB1055891E14E2060003C309 /* Invalid-DigiNotar_PKIoverheid_CA_Organisatie_-_G2-Cert.crt in CopyFiles */,
+                               EB10558A1E14E2060003C309 /* Invalid-diginotarpkioverheidcaoverheid.crt in CopyFiles */,
+                               EB10558B1E14E2060003C309 /* Invalid-diginotarpkioverheidcaoverheidenbedrijven-Cert.crt in CopyFiles */,
+                               EB10558C1E14E2060003C309 /* Ministerie_van_Defensie_Certificatie_Autoriteit_G2.crt in CopyFiles */,
+                               EB10558D1E14E2060003C309 /* Ministerie_van_Defensie_Certificatie_Autoriteit.crt in CopyFiles */,
+                               EB10558E1E14E2060003C309 /* staatdernederlandenorganisatieca-g2-Cert.crt in CopyFiles */,
+                               EB10558F1E14E2060003C309 /* staatdernederlandenoverheidca-Cert.crt in CopyFiles */,
+                               EB1055901E14E2060003C309 /* Invalid-webmail.portofamsterdam.nl.crt in CopyFiles */,
+                               EB1055921E14E2060003C309 /* DigiNotarCA2007RootCertificate.crt in CopyFiles */,
+                               EB1055931E14E2060003C309 /* Invalid-asterisk.google.com.crt in CopyFiles */,
+                               EB1055941E14E2060003C309 /* Invalid-muisonline.omnyacc-denhelder.nl-diginotar.cyberca.crt in CopyFiles */,
+                               EB1055951E14E2060003C309 /* Invalid-webmail.terneuzen.nl-diginotar-services.crt in CopyFiles */,
+                               EB1055961E14E2060003C309 /* Invalid-www.maestre.com-diginotal.extended.validation.crt in CopyFiles */,
+                               EB1055971E14E2060003C309 /* Invalid-www.mobilehostingservices.nl-diginotar-services-1024.crt in CopyFiles */,
+                               EB1055981E14E2060003C309 /* diginotar-public-ca-2025-Cert.crt in CopyFiles */,
+                               EB1055991E14E2060003C309 /* diginotar-services-1024-entrust-secure-server-Cert.crt in CopyFiles */,
+                               EB10559A1E14E2060003C309 /* diginotar-services-diginotar-root-Cert.crt in CopyFiles */,
+                               EB10559B1E14E2060003C309 /* diginotar.cyberca-gte.global.root-Cert.crt in CopyFiles */,
+                               EB10559C1E14E2060003C309 /* diginotar.extended.validation-diginotar.root.ca-Cert.crt in CopyFiles */,
+                               EB10559D1E14E2060003C309 /* diginotar.root.ca-entrust-secure-server-Cert.crt in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB27FF0F1E402CD300EC9E3A /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB3FB9A3231C125400DF52EA /* Copy Logging Files */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Preferences/Logging/Subsystems;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB3FB9B8231C12AD00DF52EA /* com.apple.security.trustedpeers.plist in Copy Logging Files */,
+                       );
+                       name = "Copy Logging Files";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB6952B4223B75C300F02C1C /* launchd plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB6952BD223B786800F02C1C /* com.apple.secitemd.plist in launchd plist */,
+                       );
+                       name = "launchd plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB76B7581DCB0C8B00C43FBC /* Install man8 page */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB76B7591DCB0CA200C43FBC /* CloudKeychainProxy.8 in Install man8 page */,
+                       );
+                       name = "Install man8 page";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB76B75B1DCB0DD500C43FBC /* Install man8 page */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB0DB37D1DCBC99100EAB6AE /* Keychain Circle Notification.8 in Install man8 page */,
+                       );
+                       name = "Install man8 page";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB89087F21F17D3C00F0DDDB /* launchd plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/LaunchDaemons;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB7AFAF422323CB6004EF091 /* com.apple.recovery_securityd.plist in launchd plist */,
+                       );
+                       name = "launchd plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EB9C1DB41BDFD4F200F89272 /* Install BATS plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EB3A8DFF1BEEC66F001A89AA /* Security_edumode.plist in Install BATS plist */,
+                               EB3D1FBA2092CB030049EF95 /* SecurityInduceLowDisk.plist in Install BATS plist */,
+                               EBDAA7E920EC4838003EA6E5 /* SecurityLocalKeychain.plist in Install BATS plist */,
+                       );
+                       name = "Install BATS plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EBB839A31E29665D00853BAC /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EBC15B1C1DB432E600126882 /* Copy Sandbox profile */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /System/Library/Sandbox/Profiles;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EBC15B1D1DB432F800126882 /* com.apple.secd.sb in Copy Sandbox profile */,
+                       );
+                       name = "Copy Sandbox profile";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EBE2026A20908C5600B48020 /* install man8 page */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /usr/share/man/man8;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EBE2026B20908C7100B48020 /* tpctl.8 in install man8 page */,
+                       );
+                       name = "install man8 page";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               EBF374701DC055580065D840 /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               EBF374801DC058070065D840 /* security-sysdiagnose.1 in CopyFiles */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               F3384FD12165A025004A2171 /* Install Ariadne Signposts Plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /AppleInternal/Library/Ariadne/Plists;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               F3384FD42165A049004A2171 /* SecurityCustomSignposts.plist in Install Ariadne Signposts Plist */,
+                       );
+                       name = "Install Ariadne Signposts Plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               F3384FD52165A071004A2171 /* Install Ariadne Signposts Plist */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 8;
+                       dstPath = /AppleInternal/Library/Ariadne/Plists;
+                       dstSubfolderSpec = 0;
+                       files = (
+                               F3384FD62165A08E004A2171 /* SecurityCustomSignposts.plist in Install Ariadne Signposts Plist */,
+                       );
+                       name = "Install Ariadne Signposts Plist";
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               F667EC5C1E96E9B100203D5C /* CopyFiles */ = {
+                       isa = PBXCopyFilesBuildPhase;
+                       buildActionMask = 2147483647;
+                       dstPath = /usr/share/man/man1/;
+                       dstSubfolderSpec = 0;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+               091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RemoteServiceDiscovery.framework; path = System/Library/PrivateFrameworks/RemoteServiceDiscovery.framework; sourceTree = SDKROOT; };
+               09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecKeyProxy.h; path = keychain/headers/SecKeyProxy.h; sourceTree = "<group>"; };
+               09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-proxy.m"; path = "OSX/shared_regressions/si-44-seckey-proxy.m"; sourceTree = SOURCE_ROOT; };
+               09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainEntitlementsTest.m; sourceTree = "<group>"; };
+               09C3E08B22A83B40004ACFC4 /* securityd.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = securityd.entitlements; sourceTree = "<group>"; };
+               09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-fv.m"; path = "OSX/shared_regressions/si-44-seckey-fv.m"; sourceTree = SOURCE_ROOT; };
+               09E9991F1F7D76550018DF67 /* SecKeyProxy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecKeyProxy.m; sourceTree = "<group>"; };
+               0C00FC81217A971800C8BF00 /* OTLocalCuttlefishReset.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTLocalCuttlefishReset.m; sourceTree = "<group>"; };
+               0C00FC85217A972E00C8BF00 /* OTLocalCuttlefishReset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTLocalCuttlefishReset.h; sourceTree = "<group>"; };
+               0C0203E023A8564E005D0A68 /* OTEscrowRecord.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; name = OTEscrowRecord.proto; path = proto/OTEscrowRecord.proto; sourceTree = "<group>"; };
+               0C0BDB2F175685B000BC1A7E /* secdtests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secdtests; sourceTree = BUILT_PRODUCTS_DIR; };
+               0C0BDB31175685B000BC1A7E /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               0C0BDB441756868B00BC1A7E /* testlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testlist.h; sourceTree = "<group>"; };
+               0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EscrowKeys.swift; sourceTree = "<group>"; };
+               0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottledPeer.swift; sourceTree = "<group>"; };
+               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>"; };
+               0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_EscrowRecords.swift; 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>"; };
+               0C0D920523BFEA740070A68C /* OTCDPRecoveryInformation.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; name = OTCDPRecoveryInformation.proto; path = proto/OTCDPRecoveryInformation.proto; sourceTree = "<group>"; };
+               0C0F76DD21399AF40074EDDF /* OTPairingMessage.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = OTPairingMessage.proto; sourceTree = "<group>"; };
+               0C12B1F02138D31600BE0A98 /* OTClientStateMachine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTClientStateMachine.m; sourceTree = "<group>"; };
+               0C12B1F52138D32F00BE0A98 /* OTClientStateMachine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTClientStateMachine.h; sourceTree = "<group>"; };
+               0C1B8BB3223323710094D5DA /* OTVouchWithRecoveryKeyOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTVouchWithRecoveryKeyOperation.h; sourceTree = "<group>"; };
+               0C1B8BB52233241E0094D5DA /* OTVouchWithRecoveryKeyOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTVouchWithRecoveryKeyOperation.m; sourceTree = "<group>"; };
+               0C2A04152152ED7F00FD4FAD /* KCJoiningAcceptSession+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KCJoiningAcceptSession+Internal.h"; sourceTree = "<group>"; };
+               0C2A041A2152EF3000FD4FAD /* KCJoiningRequestSession+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KCJoiningRequestSession+Internal.h"; 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; };
+               0C2F336A20DD643B0031A92D /* OTClique.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTClique.m; sourceTree = "<group>"; };
+               0C2F337020DD647C0031A92D /* OTRamping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRamping.h; sourceTree = "<group>"; };
+               0C2F337120DD647D0031A92D /* OTRamping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRamping.m; sourceTree = "<group>"; };
+               0C3BB3522188E18A0018FC14 /* OTPrivateKey+SF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OTPrivateKey+SF.m"; path = "keychain/TrustedPeersHelper/categories/OTPrivateKey+SF.m"; sourceTree = SOURCE_ROOT; };
+               0C3BB3542188E18B0018FC14 /* OTAuthenticatedCiphertext+SF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "OTAuthenticatedCiphertext+SF.m"; path = "keychain/TrustedPeersHelper/categories/OTAuthenticatedCiphertext+SF.m"; sourceTree = SOURCE_ROOT; };
+               0C3BB3562188E18B0018FC14 /* OTPrivateKey+SF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OTPrivateKey+SF.h"; path = "keychain/TrustedPeersHelper/categories/OTPrivateKey+SF.h"; sourceTree = SOURCE_ROOT; };
+               0C3BB3572188E18C0018FC14 /* OTAuthenticatedCiphertext+SF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "OTAuthenticatedCiphertext+SF.h"; path = "keychain/TrustedPeersHelper/categories/OTAuthenticatedCiphertext+SF.h"; sourceTree = SOURCE_ROOT; };
+               0C3C00721EF3636300AB19FE /* secd-155-otr-negotiation-monitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-155-otr-negotiation-monitor.m"; sourceTree = "<group>"; };
+               0C3C47C024902D450084B951 /* OTSupportOctagonMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSupportOctagonMessage.m; sourceTree = "<group>"; };
+               0C3C47C224902D460084B951 /* OTSupportSOSMessage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSupportSOSMessage.h; sourceTree = "<group>"; };
+               0C3C47C324902D460084B951 /* OTSupportSOSMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSupportSOSMessage.m; sourceTree = "<group>"; };
+               0C3C47C424902D470084B951 /* OTSupportOctagonMessage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSupportOctagonMessage.h; sourceTree = "<group>"; };
+               0C3C47C524902D470084B951 /* OTGlobalEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTGlobalEnums.h; sourceTree = "<group>"; };
+               0C3DF8C524789C04009CF03A /* Container_Peers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_Peers.swift; sourceTree = "<group>"; };
+               0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTEscrowRecordMetadata.m; path = proto/generated_source/OTEscrowRecordMetadata.m; sourceTree = "<group>"; };
+               0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTEscrowRecordMetadataClientMetadata.m; path = proto/generated_source/OTEscrowRecordMetadataClientMetadata.m; sourceTree = "<group>"; };
+               0C468FDA23C7D41D006F4582 /* OTEscrowRecordMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTEscrowRecordMetadata.h; path = proto/generated_source/OTEscrowRecordMetadata.h; sourceTree = "<group>"; };
+               0C468FDB23C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTEscrowRecordMetadataClientMetadata.h; path = proto/generated_source/OTEscrowRecordMetadataClientMetadata.h; sourceTree = "<group>"; };
+               0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTEscrowRecord.m; path = proto/generated_source/OTEscrowRecord.m; sourceTree = "<group>"; };
+               0C468FDE23C7D471006F4582 /* OTEscrowRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTEscrowRecord.h; path = proto/generated_source/OTEscrowRecord.h; sourceTree = "<group>"; };
+               0C468FE723C7D4C7006F4582 /* OTICDPRecordContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTICDPRecordContext.h; path = proto/generated_source/OTICDPRecordContext.h; sourceTree = "<group>"; };
+               0C468FE823C7D4C8006F4582 /* OTEscrowAuthenticationInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTEscrowAuthenticationInformation.h; path = proto/generated_source/OTEscrowAuthenticationInformation.h; sourceTree = "<group>"; };
+               0C468FE923C7D4C8006F4582 /* OTICDPRecordSilentContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTICDPRecordSilentContext.h; path = proto/generated_source/OTICDPRecordSilentContext.h; sourceTree = "<group>"; };
+               0C468FEA23C7D4C8006F4582 /* OTCDPRecoveryInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OTCDPRecoveryInformation.h; path = proto/generated_source/OTCDPRecoveryInformation.h; sourceTree = "<group>"; };
+               0C468FEB23C7D4C9006F4582 /* OTICDPRecordSilentContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTICDPRecordSilentContext.m; path = proto/generated_source/OTICDPRecordSilentContext.m; sourceTree = "<group>"; };
+               0C468FEC23C7D4C9006F4582 /* OTEscrowAuthenticationInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTEscrowAuthenticationInformation.m; path = proto/generated_source/OTEscrowAuthenticationInformation.m; sourceTree = "<group>"; };
+               0C468FED23C7D4C9006F4582 /* OTICDPRecordContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTICDPRecordContext.m; path = proto/generated_source/OTICDPRecordContext.m; sourceTree = "<group>"; };
+               0C468FEE23C7D4CA006F4582 /* OTCDPRecoveryInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OTCDPRecoveryInformation.m; path = proto/generated_source/OTCDPRecoveryInformation.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>"; };
+               0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+RecoveryKey.swift"; sourceTree = "<group>"; };
+               0C4F4DDA211535E8007F7E20 /* OTEpochOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTEpochOperation.m; sourceTree = "<group>"; };
+               0C4F4DE121153659007F7E20 /* OTEpochOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTEpochOperation.h; sourceTree = "<group>"; };
+               0C5258B821BB05C100B32C96 /* FakeSOSControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = FakeSOSControl.m; path = Tests/FakeSOSControl.m; sourceTree = "<group>"; };
+               0C5258BC21BB137800B32C96 /* FakeSOSControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FakeSOSControl.h; path = Tests/FakeSOSControl.h; sourceTree = "<group>"; };
+               0C5824A322860001009E8C15 /* OctagonTests+HealthCheck.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+HealthCheck.swift"; sourceTree = "<group>"; };
+               0C64C07C2485A53000D84A5D /* OTPreloadOctagonKeysOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTPreloadOctagonKeysOperation.m; sourceTree = "<group>"; };
+               0C64C07F2485A54100D84A5D /* OTPreloadOctagonKeysOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPreloadOctagonKeysOperation.h; sourceTree = "<group>"; };
+               0C6604692134983900BFBBB8 /* OTEstablishOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTEstablishOperation.m; sourceTree = "<group>"; };
+               0C66046E2134985100BFBBB8 /* OTEstablishOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTEstablishOperation.h; sourceTree = "<group>"; };
+               0C6604782134C86500BFBBB8 /* OTDeviceInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTDeviceInformation.h; sourceTree = "<group>"; };
+               0C66047B2134C88C00BFBBB8 /* OTDeviceInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTDeviceInformation.m; sourceTree = "<group>"; };
+               0C6604812134DD5D00BFBBB8 /* OctagonPairingTests+ProximitySetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonPairingTests+ProximitySetup.swift"; sourceTree = "<group>"; };
+               0C664AB2175926B20092D3D9 /* secdtests-entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "secdtests-entitlements.plist"; sourceTree = "<group>"; };
+               0C6C2B682258211800C53C96 /* AppleAccount.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleAccount.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/AppleAccount.framework; sourceTree = DEVELOPER_DIR; };
+               0C6C2B6C2258295D00C53C96 /* UIKitCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKitCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/UIKitCore.framework; sourceTree = DEVELOPER_DIR; };
+               0C7382F023863AD5004F98CB /* reset_ick_account */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = reset_ick_account; sourceTree = "<group>"; };
+               0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = KeychainCircle.framework; path = System/Library/PrivateFrameworks/KeychainCircle.framework; sourceTree = SDKROOT; };
+               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; };
+               0C87D3D6229326A2007853B5 /* OTEnsureOctagonKeyConsistency.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTEnsureOctagonKeyConsistency.m; sourceTree = "<group>"; };
+               0C87D3DA229326CB007853B5 /* OTEnsureOctagonKeyConsistency.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTEnsureOctagonKeyConsistency.h; sourceTree = "<group>"; };
+               0C87D3E2229368A7007853B5 /* OctagonTests+SOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+SOS.swift"; sourceTree = "<group>"; };
+               0C89BDA021554DD2003F3CC0 /* OTAccountMetadataClassC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTAccountMetadataClassC.m; sourceTree = "<group>"; };
+               0C89BDA121554DD3003F3CC0 /* OTAccountMetadataClassC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTAccountMetadataClassC.h; sourceTree = "<group>"; };
+               0C8BBE971FC9DA5A00580909 /* OTDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTDefines.h; 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; path = OTControl.h; sourceTree = "<group>"; };
+               0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTControlProtocol.h; sourceTree = "<group>"; };
+               0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTControlProtocol.m; sourceTree = "<group>"; };
+               0C8BBF0E1FCB452400580909 /* OTControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTControl.m; sourceTree = "<group>"; };
+               0C8BBF0F1FCB481800580909 /* OTManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTManager.m; sourceTree = "<group>"; };
+               0C8BBF101FCB486B00580909 /* OTManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTManager.h; sourceTree = "<group>"; };
+               0C8FD546214AEC650098E3FB /* OTJoiningConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTJoiningConfiguration.h; sourceTree = "<group>"; };
+               0C8FD549214AECD70098E3FB /* OTJoiningConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTJoiningConfiguration.m; sourceTree = "<group>"; };
+               0C97867C235A76E70040A867 /* com.apple.security.signposts.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.signposts.plist; sourceTree = "<group>"; };
+               0C9A54B4250C27F100FF007B /* OctagonTrustTests+Errors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OctagonTrustTests+Errors.m"; sourceTree = "<group>"; };
+               0C9A54B7250C290800FF007B /* OctagonTrustTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTrustTests.h; sourceTree = "<group>"; };
+               0C9AE289214054F4003BFDB5 /* OTSponsorToApplicantRound1M2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSponsorToApplicantRound1M2.h; sourceTree = "<group>"; };
+               0C9AE28A214054F5003BFDB5 /* OTSponsorToApplicantRound2M2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSponsorToApplicantRound2M2.h; sourceTree = "<group>"; };
+               0C9AE28B214054F5003BFDB5 /* OTApplicantToSponsorRound2M1.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTApplicantToSponsorRound2M1.h; sourceTree = "<group>"; };
+               0C9AE28D214054F6003BFDB5 /* OTSponsorToApplicantRound1M2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSponsorToApplicantRound1M2.m; sourceTree = "<group>"; };
+               0C9AE28E214054F6003BFDB5 /* OTApplicantToSponsorRound2M1.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTApplicantToSponsorRound2M1.m; sourceTree = "<group>"; };
+               0C9AE290214054F7003BFDB5 /* OTSponsorToApplicantRound2M2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSponsorToApplicantRound2M2.m; sourceTree = "<group>"; };
+               0C9AE2A1214055CE003BFDB5 /* OTPairingMessage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPairingMessage.h; sourceTree = "<group>"; };
+               0C9AE2A2214055CF003BFDB5 /* OTPairingMessage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTPairingMessage.m; sourceTree = "<group>"; };
+               0C9F65AA23E3ACF700B1A2C5 /* OTEscrowTranslation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTEscrowTranslation.m; sourceTree = "<group>"; };
+               0C9F65AC23E3ACF700B1A2C5 /* OTEscrowTranslation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTEscrowTranslation.h; sourceTree = "<group>"; };
+               0CA1D0B223E9023100021038 /* OctagonTests+EscrowTestVectors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+EscrowTestVectors.swift"; 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>"; };
+               0CA702082280D5600085AC54 /* OTCheckHealthOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTCheckHealthOperation.m; sourceTree = "<group>"; };
+               0CA7020B2280D99D0085AC54 /* OTCheckHealthOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTCheckHealthOperation.h; 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>"; };
+               0CADDF0421545C8E00DF8B06 /* OctagonPairingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonPairingTests.swift; sourceTree = "<group>"; };
+               0CB321F01464A95F00587CD3 /* CreateCerts.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = CreateCerts.sh; sourceTree = "<group>"; };
+               0CB582BC218915270040C5F2 /* OTPrivateKey.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = OTPrivateKey.proto; sourceTree = "<group>"; };
+               0CB582BD218915270040C5F2 /* OTAuthenticatedCiphertext.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = OTAuthenticatedCiphertext.proto; sourceTree = "<group>"; };
+               0CB582BE218915270040C5F2 /* OTBottle.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = OTBottle.proto; sourceTree = "<group>"; };
+               0CB582BF218915280040C5F2 /* OTBottleContents.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = OTBottleContents.proto; sourceTree = "<group>"; };
+               0CB582C0218915380040C5F2 /* OTAuthenticatedCiphertext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTAuthenticatedCiphertext.h; sourceTree = "<group>"; };
+               0CB582C1218915380040C5F2 /* OTPrivateKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPrivateKey.h; sourceTree = "<group>"; };
+               0CB582C2218915380040C5F2 /* OTBottleContents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTBottleContents.h; sourceTree = "<group>"; };
+               0CB582C3218915390040C5F2 /* OTPrivateKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPrivateKey.m; sourceTree = "<group>"; };
+               0CB582C4218915390040C5F2 /* OTBottle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTBottle.m; sourceTree = "<group>"; };
+               0CB582C5218915390040C5F2 /* OTAuthenticatedCiphertext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTAuthenticatedCiphertext.m; sourceTree = "<group>"; };
+               0CB582C62189153A0040C5F2 /* OTBottleContents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTBottleContents.m; sourceTree = "<group>"; };
+               0CB582C72189153A0040C5F2 /* OTBottle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTBottle.h; sourceTree = "<group>"; };
+               0CB8DC962194B1300021A7C8 /* OTVouchWithBottleOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTVouchWithBottleOperation.h; sourceTree = "<group>"; };
+               0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTVouchWithBottleOperation.m; sourceTree = "<group>"; };
+               0CBA047C214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonPairingTests+ProxMultiClients.swift"; sourceTree = "<group>"; };
+               0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestsObjcTranslation.m; sourceTree = "<group>"; };
+               0CBEF3422242C9BE00015691 /* TestsObjcTranslation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestsObjcTranslation.h; sourceTree = "<group>"; };
+               0CBF883A23AAD9DC00652EDD /* OctagonTests+EscrowRecords.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+EscrowRecords.swift"; sourceTree = "<group>"; };
+               0CC8A8FA2123A9EB005D7F6A /* OTClientVoucherOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTClientVoucherOperation.m; sourceTree = "<group>"; };
+               0CC8A9002123AA3B005D7F6A /* OTClientVoucherOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTClientVoucherOperation.h; sourceTree = "<group>"; };
+               0CC8A9012123AEF7005D7F6A /* OTJoinWithVoucherOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTJoinWithVoucherOperation.m; sourceTree = "<group>"; };
+               0CC8A9052123AF16005D7F6A /* OTJoinWithVoucherOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTJoinWithVoucherOperation.h; sourceTree = "<group>"; };
+               0CCC227923F357EE00E1FCD0 /* OctagonTrustTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OctagonTrustTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               0CCC229223F35D4300E1FCD0 /* OctagonTrustTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OctagonTrustTests-Info.plist"; sourceTree = "<group>"; };
+               0CCC229F23F367D100E1FCD0 /* OctagonTrustTests-EscrowRecords.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OctagonTrustTests-EscrowRecords.m"; sourceTree = "<group>"; };
+               0CCC22A323F36DD300E1FCD0 /* OctagonTrustTests-EscrowTestVectors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OctagonTrustTests-EscrowTestVectors.h"; sourceTree = "<group>"; };
+               0CCC22B123F38B5B00E1FCD0 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
+               0CCC22CC23F395A100E1FCD0 /* OctagonTrustEscrowRecoverer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTrustEscrowRecoverer.h; sourceTree = "<group>"; };
+               0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreCDP.framework; path = System/Library/PrivateFrameworks/CoreCDP.framework; sourceTree = SDKROOT; };
+               0CCCC7C720261D050024405E /* OT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OT.h; sourceTree = "<group>"; };
+               0CCCC7C820261D310024405E /* OT.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OT.m; sourceTree = "<group>"; };
+               0CCDE7161EEB08220021A946 /* secd-156-timers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-156-timers.m"; sourceTree = "<group>"; };
+               0CD3D5152240479600024755 /* OTSetRecoveryKeyOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSetRecoveryKeyOperation.m; sourceTree = "<group>"; };
+               0CD3D518224047B400024755 /* OTSetRecoveryKeyOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSetRecoveryKeyOperation.h; sourceTree = "<group>"; };
+               0CD5797721498F7700C43496 /* OctagonPairingTests+Piggybacking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonPairingTests+Piggybacking.swift"; sourceTree = "<group>"; };
+               0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OctagonTrust.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               0CD743A823C3EC8000FA0EC5 /* OctagonTrust.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTrust.h; sourceTree = "<group>"; };
+               0CD743A923C3EC8000FA0EC5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               0CD743B723C3ED7E00FA0EC5 /* OctagonTrust.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonTrust.m; sourceTree = "<group>"; };
+               0CD743BA23C3EF0D00FA0EC5 /* OTClique+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OTClique+Private.h"; 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>"; };
+               0CD8D654207D6E65005CDBE8 /* SFAnalytics+Signin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFAnalytics+Signin.h"; sourceTree = "<group>"; };
+               0CD9E33E235928D1002995DE /* OctagonSignPosts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonSignPosts.h; sourceTree = "<group>"; };
+               0CD9E340235928E9002995DE /* OctagonSignPosts.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonSignPosts.m; sourceTree = "<group>"; };
+               0CDBCD8620AD03FB007F8EA7 /* OTClique.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTClique.h; sourceTree = "<group>"; };
+               0CDD6F76226E62AD009094C2 /* OTTriggerEscrowUpdateOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTTriggerEscrowUpdateOperation.m; sourceTree = "<group>"; };
+               0CDD6F78226E62BC009094C2 /* OTTriggerEscrowUpdateOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTTriggerEscrowUpdateOperation.h; sourceTree = "<group>"; };
+               0CE15E2A222DF63500B7EAA4 /* RecoveryKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RecoveryKey.swift; path = keychain/TrustedPeersHelper/RecoveryKey/RecoveryKey.swift; sourceTree = SOURCE_ROOT; };
+               0CE15E2A222DF63500B7EAA5 /* SetValueTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SetValueTransformer.swift; path = keychain/TrustedPeersHelper/SetValueTransformer.swift; sourceTree = SOURCE_ROOT; };
+               0CE15E2B222DF63600B7EAA4 /* RecoverKeySet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RecoverKeySet.swift; path = keychain/TrustedPeersHelper/RecoveryKey/RecoverKeySet.swift; sourceTree = SOURCE_ROOT; };
+               0CE15E34222DF66D00B7EAA4 /* OTRecovery.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = OTRecovery.proto; sourceTree = "<group>"; };
+               0CE15E3A222DF6A600B7EAA4 /* OTRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTRecovery.m; sourceTree = "<group>"; };
+               0CE15E3B222DF6A700B7EAA4 /* Recovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Recovery.h; sourceTree = "<group>"; };
+               0CE15E3C222DF6A700B7EAA4 /* Recovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Recovery.m; sourceTree = "<group>"; };
+               0CE15E3D222DF6A700B7EAA4 /* OTRecovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTRecovery.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>"; };
+               0CE7604D1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "SOSAccountTrustClassic+Retirement.m"; path = "SecureObjectSync/SOSAccountTrustClassic+Retirement.m"; sourceTree = "<group>"; };
+               0CE7604F1E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SOSAccountTrustClassic+Expansion.h"; path = "SecureObjectSync/SOSAccountTrustClassic+Expansion.h"; 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; };
+               0CF405FC2072E352003D6A7F /* SFTMTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SFTMTests-Info.plist"; sourceTree = "<group>"; };
+               0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CuttlefishExtensionWorkaround.swift; sourceTree = "<group>"; };
+               0CF7613D23F24B5D00A3C3AD /* KeychainCircle.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = KeychainCircle.modulemap; path = Modules/KeychainCircle.modulemap; sourceTree = "<group>"; };
+               0CF7613F23F24B5E00A3C3AD /* OctagonTrust.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = OctagonTrust.modulemap; path = Modules/OctagonTrust.modulemap; 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>"; };
+               107227350D91FE89003CF14F /* libbsm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbsm.dylib; path = usr/lib/libbsm.dylib; sourceTree = SDKROOT; };
+               18351B8F14CB65870097860E /* SecBase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBase64.h; sourceTree = "<group>"; };
+               1B2BD391235E050D009A8624 /* SecEC-tapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SecEC-tapi.h"; path = "OSX/sec/Security/SecEC-tapi.h"; sourceTree = "<group>"; };
+               1B2BD393235E050E009A8624 /* SecPolicy-tapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SecPolicy-tapi.h"; path = "OSX/sec/Security/SecPolicy-tapi.h"; sourceTree = "<group>"; };
+               1B2BD394235E050E009A8624 /* Security-tapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Security-tapi.h"; path = "OSX/sec/Security/Security-tapi.h"; sourceTree = "<group>"; };
+               1B4C4448223AE65400C6F97F /* TPPBPolicyKeyViewMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyKeyViewMapping.h; sourceTree = "<group>"; };
+               1B4C444A223AE65400C6F97F /* TPPBPolicyKeyViewMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyKeyViewMapping.m; sourceTree = "<group>"; };
+               1B5EAAD92252ABCC008D27E7 /* OTFetchViewsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTFetchViewsOperation.h; sourceTree = "<group>"; };
+               1B5EAADB2252ABCC008D27E7 /* OTFetchViewsOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTFetchViewsOperation.m; sourceTree = "<group>"; };
+               1B8341B72239AD39002BF18A /* TPPBPolicyKeyViewMapping.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyKeyViewMapping.proto; sourceTree = "<group>"; };
+               1B995256226681ED00A2D6CD /* PolicyReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PolicyReporter.h; sourceTree = "<group>"; };
+               1B995258226681EE00A2D6CD /* PolicyReporter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PolicyReporter.m; sourceTree = "<group>"; };
+               1BB1CAB4232C05BB001D0C71 /* CuttlefishXPCWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CuttlefishXPCWrapper.m; sourceTree = "<group>"; };
+               1BB1CAB6232C05BC001D0C71 /* CuttlefishXPCWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CuttlefishXPCWrapper.h; sourceTree = "<group>"; };
+               1BC6F79621C9955D005ED67A /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = util.m; sourceTree = "<group>"; };
+               1BC6F79821C9955E005ED67A /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
+               1BDEBEF72252DEB1009AD3D6 /* policy_dryrun.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = policy_dryrun.m; sourceTree = "<group>"; };
+               1BDEBEFA2252E1DD009AD3D6 /* policy_dryrun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = policy_dryrun.h; sourceTree = "<group>"; };
+               1BE85ECD235CEB610051E1D8 /* cms-tapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cms-tapi.h"; path = "OSX/libsecurity_smime/lib/cms-tapi.h"; sourceTree = "<group>"; };
+               1BE85ED1235CEBB30051E1D8 /* secport-tapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "secport-tapi.h"; sourceTree = "<group>"; };
+               1BE85ED4235CEC250051E1D8 /* sslDeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sslDeprecated.h; path = OSX/libsecurity_ssl/lib/sslDeprecated.h; sourceTree = "<group>"; };
+               1BF640EE222EEB6C002D0FCB /* TPPolicyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPolicyTests.m; sourceTree = "<group>"; };
+               1F631C5122387F27005920D8 /* legacydevid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = legacydevid.cpp; sourceTree = "<group>"; usesTabs = 0; };
+               1F631C5222387F27005920D8 /* legacydevid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = legacydevid.h; sourceTree = "<group>"; };
+               1FC7E8A02323303700AC3AD0 /* CodeSigningHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CodeSigningHelper.entitlements; 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; };
+               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>"; };
+               3D58394D21890FFB000ACA44 /* SecExperimentTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecExperimentTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               3DC5BD58241830D50039ABF4 /* SecureTransportTests_macos.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = SecureTransportTests_macos.xctestplan; path = OSX/libsecurity_ssl/regressions/SecureTransportTests/SecureTransportTests_macos.xctestplan; sourceTree = "<group>"; };
+               3DC5BD59241845100039ABF4 /* SecureTransportTests_ios.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = SecureTransportTests_ios.xctestplan; path = OSX/libsecurity_ssl/regressions/SecureTransportTests/SecureTransportTests_ios.xctestplan; sourceTree = "<group>"; };
+               3DD1FE78201AA50C0086D049 /* STLegacyTests+clientauth41.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+clientauth41.m"; sourceTree = "<group>"; };
+               3DD1FE79201AA50D0086D049 /* SecureTransport_macosTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SecureTransport_macosTests.plist; sourceTree = "<group>"; };
+               3DD1FE7A201AA50D0086D049 /* STLegacyTests-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "STLegacyTests-Entitlements.plist"; sourceTree = "<group>"; };
+               3DD1FE7B201AA50D0086D049 /* STLegacyTests+noconn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+noconn.m"; sourceTree = "<group>"; };
+               3DD1FE7C201AA50E0086D049 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               3DD1FE7D201AA50E0086D049 /* STLegacyTests+tls12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+tls12.m"; sourceTree = "<group>"; };
+               3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecureTransportTests.m; sourceTree = "<group>"; };
+               3DD1FE7F201AA50F0086D049 /* STLegacyTests+sni.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sni.m"; sourceTree = "<group>"; };
+               3DD1FE80201AA5100086D049 /* STLegacyTests+sessionstate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sessionstate.m"; sourceTree = "<group>"; };
+               3DD1FE81201AA5100086D049 /* STLegacyTests+sslciphers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sslciphers.m"; sourceTree = "<group>"; };
+               3DD1FE82201AA5110086D049 /* STLegacyTests+dhe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+dhe.m"; sourceTree = "<group>"; };
+               3DD1FE83201AA5110086D049 /* STLegacyTests+crashes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+crashes.m"; sourceTree = "<group>"; };
+               3DD1FE84201AA5120086D049 /* STLegacyTests+falsestart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+falsestart.m"; sourceTree = "<group>"; };
+               3DD1FE85201AA5120086D049 /* STLegacyTests+renegotiate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+renegotiate.m"; sourceTree = "<group>"; };
+               3DD1FE86201AA5120086D049 /* SecureTransport_iosTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SecureTransport_iosTests.plist; sourceTree = "<group>"; };
+               3DD1FE87201AA5130086D049 /* STLegacyTests+clientauth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+clientauth.m"; sourceTree = "<group>"; };
+               3DD1FE88201AA5130086D049 /* STLegacyTests+split.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+split.m"; sourceTree = "<group>"; };
+               3DD1FE89201AA5140086D049 /* STLegacyTests+ciphers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+ciphers.m"; sourceTree = "<group>"; };
+               3DD1FE8A201AA5140086D049 /* STLegacyTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STLegacyTests.h; sourceTree = "<group>"; };
+               3DD1FE8B201AA5150086D049 /* STLegacyTests+sessioncache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+sessioncache.m"; sourceTree = "<group>"; };
+               3DD1FE8C201AA5150086D049 /* STLegacyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = STLegacyTests.m; sourceTree = "<group>"; };
+               3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureTransport_macos_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               3DD1FFA8201FC5C20086D049 /* libcoretls.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls.tbd; path = usr/lib/libcoretls.tbd; sourceTree = SDKROOT; };
+               3DD1FFA9201FC5C30086D049 /* libcoretls_cfhelpers.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcoretls_cfhelpers.tbd; path = usr/lib/libcoretls_cfhelpers.tbd; sourceTree = SDKROOT; };
+               3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecureTransport_ios_tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               3DD2589820478CCE00F5DA78 /* STLegacyTests+session.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "STLegacyTests+session.m"; sourceTree = "<group>"; };
+               3E4D49BC2531170600B124B3 /* secsecstaticcodeapitest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secsecstaticcodeapitest; sourceTree = BUILT_PRODUCTS_DIR; };
+               3E4D508E253117DD00B124B3 /* secsecstaticcodeapitest.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = secsecstaticcodeapitest.c; sourceTree = "<group>"; };
+               3E88361124F068EF00E9F4D6 /* secseccodeapitest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secseccodeapitest; sourceTree = BUILT_PRODUCTS_DIR; };
+               3E88361324F0699F00E9F4D6 /* secseccodeapitest.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = secseccodeapitest.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; };
+               4381690F1B4EDCBD00C54D58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               438169E11B4EDEE200C54D58 /* SOSCCAuthPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCCAuthPlugin.h; sourceTree = "<group>"; };
+               438169E21B4EDEE200C54D58 /* SOSCCAuthPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSCCAuthPlugin.m; sourceTree = "<group>"; };
+               43DB542E1BB1F85B0083C3F1 /* ProtectedCloudStorage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtectedCloudStorage.framework; path = System/Library/PrivateFrameworks/ProtectedCloudStorage.framework; sourceTree = SDKROOT; };
+               4432AF6A1A01458F000958DC /* libcoreauthd_client.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libcoreauthd_client.a; path = usr/local/lib/libcoreauthd_client.a; sourceTree = SDKROOT; };
+               4432AF8C1A01472C000958DC /* libaks_acl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libaks_acl.a; path = usr/local/lib/libaks_acl.a; sourceTree = SDKROOT; };
+               443381D918A3D81400215606 /* SecAccessControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecAccessControl.h; path = keychain/headers/SecAccessControl.h; sourceTree = "<group>"; };
+               443381DA18A3D81400215606 /* SecAccessControlPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControlPriv.h; sourceTree = "<group>"; };
+               4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_test.a; path = usr/local/lib/libctkclient_test.a; sourceTree = SDKROOT; };
+               4469FBDD1AA0A45C0021AA26 /* libctkclient_sep.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_sep.a; path = usr/local/lib/libctkclient_sep.a; sourceTree = SDKROOT; };
+               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>"; };
+               470D966C1FCDE4BA0065FE90 /* KeychainModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = KeychainModel.xcdatamodel; sourceTree = "<group>"; };
+               470D966F1FCDE55B0065FE90 /* SecCDKeychain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecCDKeychain.h; sourceTree = "<group>"; };
+               470D96701FCDE55B0065FE90 /* SecCDKeychain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecCDKeychain.m; sourceTree = "<group>"; };
+               470D96841FCE34370065FE90 /* CDKeychainTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CDKeychainTests.m; sourceTree = "<group>"; };
+               471024D91E79CB6D00844C09 /* CKKSTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSTests.h; sourceTree = "<group>"; };
+               4718AE2D205B39620068EC3F /* securityd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityd; sourceTree = BUILT_PRODUCTS_DIR; };
+               4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_bridge.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               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; };

                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>"; };
                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>"; };


@@ -9864,7 +11988,7 @@
                4723C9D11F1531970082882F /* CKKSLoggerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLoggerTests.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>"; };
                4723C9D11F1531970082882F /* CKKSLoggerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLoggerTests.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; };
+               4727FBB71F9918580003AE36 /* secdxctests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secdxctests.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; };
                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; };


@@ -9889,6 +12013,27 @@
                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>"; };
                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>"; };

+               475EDCD420D98934009D2409 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCDA20D98A28009D2409 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/CloudKit.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCDC20D98A3C009D2409 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/SecurityFoundation.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCDE20D98A54009D2409 /* ApplePushService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplePushService.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/ApplePushService.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCE020D98A5B009D2409 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCE220D98A65009D2409 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };
+               475EDCE420D98A71009D2409 /* ProtocolBuffer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ProtocolBuffer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/ProtocolBuffer.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCE820D98AA8009D2409 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCEA20D98AAF009D2409 /* WirelessDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WirelessDiagnostics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/WirelessDiagnostics.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCEC20D98AB7009D2409 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/Accounts.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCEE20D98AC7009D2409 /* SharedWebCredentials.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SharedWebCredentials.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/SharedWebCredentials.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCF320D98B61009D2409 /* libMobileGestalt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMobileGestalt.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/lib/libMobileGestalt.dylib; sourceTree = DEVELOPER_DIR; };
+               475EDCF520D98BCF009D2409 /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/local/lib/libACM.a; sourceTree = DEVELOPER_DIR; };
+               475EDCF720D98BF6009D2409 /* CoreCDP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreCDP.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/CoreCDP.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCF920D98C0D009D2409 /* CryptoTokenKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoTokenKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/CryptoTokenKit.framework; sourceTree = DEVELOPER_DIR; };
+               475EDCFD20D98C53009D2409 /* libaks.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaks.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/local/lib/libaks.a; sourceTree = DEVELOPER_DIR; };
+               475EDCFF20D98C64009D2409 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; };
+               475EDD0120D98C81009D2409 /* libaks_acl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaks_acl.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/local/lib/libaks_acl.a; sourceTree = DEVELOPER_DIR; };
+               475EDD0320D98CD0009D2409 /* libctkclient.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/local/lib/libctkclient.a; sourceTree = DEVELOPER_DIR; };
+               475EDD0520D98CE2009D2409 /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/LocalAuthentication.framework; sourceTree = DEVELOPER_DIR; };
+               475EDD0720D9A031009D2409 /* LocalAuthenticationPrivateUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthenticationPrivateUI.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/LocalAuthenticationPrivateUI.framework; sourceTree = DEVELOPER_DIR; };

                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>"; };
                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>"; };


@@ -9911,10 +12056,9 @@
                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>"; };
                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>"; };
+               479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSAnalytics.h; sourceTree = "<group>"; };
+               479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSAnalytics.m; sourceTree = "<group>"; };
+               47922D171FAA65120008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = SecDbKeychainSerializedAKSWrappedKey.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>"; };
                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>"; };


@@ -9931,14 +12075,17 @@
                47C2F1832059CB680062DE30 /* KeychainResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                47C2F1862059CB680062DE30 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                47C51B841EEA657D0032D9E5 /* SecurityUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecurityUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                47C2F1832059CB680062DE30 /* KeychainResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                47C2F1862059CB680062DE30 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; 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>"; };
+               47C51B861EEA657D0032D9E5 /* SecKeyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecKeyTests.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>"; };
                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; };
+               47D1838B1FB3827700CFCD89 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../../AppleInternal/Library/Frameworks/OCMock.framework; sourceTree = SDKROOT; };

                47FF17241FD60ACA00875565 /* SFKeychainServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainServer.h; sourceTree = "<group>"; };
                47FF17251FD60ACA00875565 /* SFKeychainServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFKeychainServer.m; sourceTree = "<group>"; };
                47FF17241FD60ACA00875565 /* SFKeychainServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainServer.h; sourceTree = "<group>"; };
                47FF17251FD60ACA00875565 /* SFKeychainServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFKeychainServer.m; sourceTree = "<group>"; };

+               480C03D321459CD60034570E /* SOSTrustedDeviceAttributes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSTrustedDeviceAttributes.m; sourceTree = "<group>"; };
+               480C03D621459CD70034570E /* SOSTrustedDeviceAttributes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSTrustedDeviceAttributes.h; sourceTree = "<group>"; };

                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>"; };
                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>"; };

+               482FE56B2177C7AE0031C11E /* AuthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/AuthKit.framework; sourceTree = DEVELOPER_DIR; };

                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>"; };
                485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSKeyedPubKeyIdentifier.h; 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>"; };
                485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSKeyedPubKeyIdentifier.h; sourceTree = "<group>"; };


@@ -9947,12 +12094,12 @@
                48776C7C1DA5BB5F00CC09B9 /* SOSRingRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSRingRecovery.m; sourceTree = "<group>"; };
                48776C7D1DA5BB5F00CC09B9 /* SOSRingRecovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSRingRecovery.h; sourceTree = "<group>"; };
                48776C801DA5BC0E00CC09B9 /* SOSAccountRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAccountRecovery.m; sourceTree = "<group>"; };
                48776C7C1DA5BB5F00CC09B9 /* SOSRingRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSRingRecovery.m; sourceTree = "<group>"; };
                48776C7D1DA5BB5F00CC09B9 /* SOSRingRecovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSRingRecovery.h; sourceTree = "<group>"; };
                48776C801DA5BC0E00CC09B9 /* SOSAccountRecovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAccountRecovery.m; sourceTree = "<group>"; };

-               4885DCAB207FF0780071FB7B /* ClientInfoByNotification.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ClientInfoByNotification.m; path = MultiDeviceSimulator/ClientInfoByNotification/ClientInfoByNotification.m; sourceTree = SOURCE_ROOT; };
+               487A65F3245B65F1005F51D6 /* secd-68-fullPeerInfoIntegrity.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-68-fullPeerInfoIntegrity.m"; sourceTree = "<group>"; };
+               48AC7B5C232B1A1700F02B6F /* SOSIntervalEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSIntervalEvent.h; sourceTree = "<group>"; };
+               48AC7B71232B1A7000F02B6F /* SOSIntervalEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSIntervalEvent.m; sourceTree = "<group>"; };

                48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = accountCirclesViewsPrint.m; sourceTree = "<group>"; };
                48C2F9331E4BCFC30093D70C /* accountCirclesViewsPrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = accountCirclesViewsPrint.h; sourceTree = "<group>"; };
                48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-66-account-recovery.m"; sourceTree = "<group>"; };
                48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = accountCirclesViewsPrint.m; sourceTree = "<group>"; };
                48C2F9331E4BCFC30093D70C /* accountCirclesViewsPrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = accountCirclesViewsPrint.h; sourceTree = "<group>"; };
                48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-66-account-recovery.m"; sourceTree = "<group>"; };

-               48E6171A1DBEC40D0098EAAD /* SOSBackupInformation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSBackupInformation.m; sourceTree = "<group>"; };
-               48E6171B1DBEC40D0098EAAD /* SOSBackupInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSBackupInformation.h; sourceTree = "<group>"; };

                48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAuthKitHelpers.m; sourceTree = "<group>"; };
                48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSAuthKitHelpers.h; sourceTree = "<group>"; };
                4AF7FFF315AFB73800B9D400 /* SecOTR.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOTR.h; sourceTree = "<group>"; };
                48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSAuthKitHelpers.m; sourceTree = "<group>"; };
                48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSAuthKitHelpers.h; sourceTree = "<group>"; };
                4AF7FFF315AFB73800B9D400 /* SecOTR.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOTR.h; sourceTree = "<group>"; };


@@ -9968,9 +12115,9 @@
                4C04A90811924BBC0020550C /* SecKeyInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecKeyInternal.h; sourceTree = "<group>"; };
                4C079EBC1794A96200D73970 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/PrivateFrameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
                4C0B906C0ACCBD240077CD03 /* SecFramework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecFramework.h; sourceTree = "<group>"; };
                4C04A90811924BBC0020550C /* SecKeyInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecKeyInternal.h; sourceTree = "<group>"; };
                4C079EBC1794A96200D73970 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/PrivateFrameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
                4C0B906C0ACCBD240077CD03 /* SecFramework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecFramework.h; sourceTree = "<group>"; };

-               4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustSettingsPriv.h; path = trust/SecTrustSettingsPriv.h; sourceTree = "<group>"; };
-               4C198F1E0ACDB4BF00AAB142 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Certificate.strings; sourceTree = "<group>"; };
-               4C198F200ACDB4BF00AAB142 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/OID.strings; sourceTree = "<group>"; usesTabs = 1; };
+               4C12828C0BB4957D00985BB0 /* SecTrustSettingsPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustSettingsPriv.h; path = trust/headers/SecTrustSettingsPriv.h; sourceTree = "<group>"; };
+               4C198F1E0ACDB4BF00AAB142 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/Certificate.strings; sourceTree = "<group>"; };
+               4C198F200ACDB4BF00AAB142 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/OID.strings; sourceTree = "<group>"; usesTabs = 1; };

                4C1B442C0BB9CAF900461B82 /* SecTrustStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrustStore.h; sourceTree = "<group>"; };
                4C28BCD60986EBCB0020C665 /* certextensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = certextensions.h; path = cssm/certextensions.h; sourceTree = "<group>"; };
                4C2F81D40BF121D2003C4F77 /* SecRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRandom.h; path = base/SecRandom.h; sourceTree = "<group>"; };
                4C1B442C0BB9CAF900461B82 /* SecTrustStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrustStore.h; sourceTree = "<group>"; };
                4C28BCD60986EBCB0020C665 /* certextensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = certextensions.h; path = cssm/certextensions.h; sourceTree = "<group>"; };
                4C2F81D40BF121D2003C4F77 /* SecRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecRandom.h; path = base/SecRandom.h; sourceTree = "<group>"; };


@@ -9987,10 +12134,10 @@
                4C3CECF21416E20400947741 /* DigiNotar_Root_CA_G2-RootCertificate.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DigiNotar_Root_CA_G2-RootCertificate.crt"; sourceTree = "<group>"; };
                4C3DD6AE179755560093F9D8 /* NSDate+TimeIntervalDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+TimeIntervalDescription.h"; sourceTree = "<group>"; };
                4C3DD6AF179755560093F9D8 /* NSDate+TimeIntervalDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+TimeIntervalDescription.m"; sourceTree = "<group>"; };
                4C3CECF21416E20400947741 /* DigiNotar_Root_CA_G2-RootCertificate.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DigiNotar_Root_CA_G2-RootCertificate.crt"; sourceTree = "<group>"; };
                4C3DD6AE179755560093F9D8 /* NSDate+TimeIntervalDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+TimeIntervalDescription.h"; sourceTree = "<group>"; };
                4C3DD6AF179755560093F9D8 /* NSDate+TimeIntervalDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+TimeIntervalDescription.m"; sourceTree = "<group>"; };

-               4C4296300BB0A68200491999 /* SecTrustSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustSettings.h; path = trust/SecTrustSettings.h; sourceTree = "<group>"; };
+               4C4296300BB0A68200491999 /* SecTrustSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustSettings.h; path = trust/headers/SecTrustSettings.h; sourceTree = "<group>"; };

                4C465C7D13AFD82300E841AC /* SecurityDevTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SecurityDevTests-Info.plist"; sourceTree = "<group>"; };
                4C47FA8D20A51DC700384CB6 /* AppleFSCompression.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleFSCompression.framework; path = System/Library/PrivateFrameworks/AppleFSCompression.framework; sourceTree = SDKROOT; };
                4C465C7D13AFD82300E841AC /* SecurityDevTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SecurityDevTests-Info.plist"; sourceTree = "<group>"; };
                4C47FA8D20A51DC700384CB6 /* AppleFSCompression.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleFSCompression.framework; path = System/Library/PrivateFrameworks/AppleFSCompression.framework; sourceTree = SDKROOT; };

-               4C4CB7100DDA44900026B660 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = entitlements.plist; path = SecurityTool/entitlements.plist; sourceTree = SOURCE_ROOT; };
+               4C4CB7100DDA44900026B660 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };

                4C4CE9070AF81ED80056B01D /* TODO */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
                4C4CE9120AF81F0E0056B01D /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                4C50ACFC1410671D00EE92DE /* DigiNotarCA2007RootCertificate.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = DigiNotarCA2007RootCertificate.crt; sourceTree = "<group>"; };
                4C4CE9070AF81ED80056B01D /* TODO */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; };
                4C4CE9120AF81F0E0056B01D /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
                4C50ACFC1410671D00EE92DE /* DigiNotarCA2007RootCertificate.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = DigiNotarCA2007RootCertificate.crt; sourceTree = "<group>"; };


@@ -10014,27 +12161,27 @@
                4C52D0E416EFCCA20079966E /* com.apple.security.CircleJoinRequested.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.security.CircleJoinRequested.plist; sourceTree = "<group>"; };
                4C52D0E516EFCCA20079966E /* NSArray+map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+map.h"; sourceTree = "<group>"; };
                4C52D0E616EFCCA20079966E /* NSArray+map.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+map.m"; sourceTree = "<group>"; };
                4C52D0E416EFCCA20079966E /* com.apple.security.CircleJoinRequested.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.security.CircleJoinRequested.plist; sourceTree = "<group>"; };
                4C52D0E516EFCCA20079966E /* NSArray+map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+map.h"; sourceTree = "<group>"; };
                4C52D0E616EFCCA20079966E /* NSArray+map.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+map.m"; sourceTree = "<group>"; };

-               4C6416D40BB34F00001C83FD /* SecPolicyPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPolicyPriv.h; path = trust/SecPolicyPriv.h; sourceTree = "<group>"; };
+               4C6416D40BB34F00001C83FD /* SecPolicyPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPolicyPriv.h; path = trust/headers/SecPolicyPriv.h; sourceTree = "<group>"; };

                4C6416F00BB357D5001C83FD /* SecInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecInternal.h; path = base/SecInternal.h; sourceTree = "<group>"; };
                4C64E00B0B8FBBF3009B306C /* Security.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Security.h; path = base/Security.h; sourceTree = "<group>"; };
                4C696B3709BFA94F000CBC75 /* SecBase.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SecBase.h; path = base/SecBase.h; sourceTree = "<group>"; };
                4C6416F00BB357D5001C83FD /* SecInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecInternal.h; path = base/SecInternal.h; sourceTree = "<group>"; };
                4C64E00B0B8FBBF3009B306C /* Security.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Security.h; path = base/Security.h; sourceTree = "<group>"; };
                4C696B3709BFA94F000CBC75 /* SecBase.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SecBase.h; path = base/SecBase.h; sourceTree = "<group>"; };

-               4C7072840AC9EA4E007CC205 /* SecKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKey.h; path = keychain/SecKey.h; sourceTree = "<group>"; };
-               4C7072D30AC9ED5A007CC205 /* SecKeyPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKeyPriv.h; path = keychain/SecKeyPriv.h; sourceTree = "<group>"; };
+               4C7072840AC9EA4E007CC205 /* SecKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKey.h; path = keychain/headers/SecKey.h; sourceTree = "<group>"; };
+               4C7072D30AC9ED5A007CC205 /* SecKeyPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKeyPriv.h; path = keychain/headers/SecKeyPriv.h; sourceTree = "<group>"; };

                4C7073C80ACB2BAD007CC205 /* SecRSAKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecRSAKey.h; sourceTree = "<group>"; };
                4C711D7613AFCD0900FE865D /* SecurityDevTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecurityDevTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
                4C7391770B01745000C4CBFA /* vmdh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vmdh.h; sourceTree = "<group>"; };
                4C7416020F1D71A2008E0E4D /* SecSCEP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSCEP.h; sourceTree = "<group>"; };
                4C7073C80ACB2BAD007CC205 /* SecRSAKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecRSAKey.h; sourceTree = "<group>"; };
                4C711D7613AFCD0900FE865D /* SecurityDevTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecurityDevTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
                4C7391770B01745000C4CBFA /* vmdh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vmdh.h; sourceTree = "<group>"; };
                4C7416020F1D71A2008E0E4D /* SecSCEP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSCEP.h; sourceTree = "<group>"; };

-               4C7608B10AC34A8100980096 /* SecCertificatePriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecCertificatePriv.h; path = trust/SecCertificatePriv.h; sourceTree = "<group>"; };
+               4C7608B10AC34A8100980096 /* SecCertificatePriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecCertificatePriv.h; path = trust/headers/SecCertificatePriv.h; sourceTree = "<group>"; };

                4C7913241799A5CB00A9633E /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
                4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecEntitlements.h; sourceTree = "<group>"; };
                4C84DA541720698900AEE225 /* AppleAccount.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleAccount.framework; path = System/Library/PrivateFrameworks/AppleAccount.framework; sourceTree = SDKROOT; };
                4C84DA6217207E8D00AEE225 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
                4C7913241799A5CB00A9633E /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
                4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecEntitlements.h; sourceTree = "<group>"; };
                4C84DA541720698900AEE225 /* AppleAccount.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleAccount.framework; path = System/Library/PrivateFrameworks/AppleAccount.framework; sourceTree = SDKROOT; };
                4C84DA6217207E8D00AEE225 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };

-               4C87F3A70D611C26000E7104 /* SecTrustPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustPriv.h; path = trust/SecTrustPriv.h; sourceTree = "<group>"; };
+               4C87F3A70D611C26000E7104 /* SecTrustPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustPriv.h; path = trust/headers/SecTrustPriv.h; sourceTree = "<group>"; };

                4C8A38C817B93DF10001B4C0 /* CloudServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudServices.framework; path = System/Library/PrivateFrameworks/CloudServices.framework; sourceTree = SDKROOT; };
                4C8B91C51416EB6A00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-webmail.portofamsterdam.nl.crt"; sourceTree = "<group>"; };
                4C8E99C20FC601D50072EB4C /* SecFrameworkStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecFrameworkStrings.h; sourceTree = "<group>"; };
                4C8A38C817B93DF10001B4C0 /* CloudServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudServices.framework; path = System/Library/PrivateFrameworks/CloudServices.framework; sourceTree = SDKROOT; };
                4C8B91C51416EB6A00A254E2 /* Invalid-webmail.portofamsterdam.nl.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-webmail.portofamsterdam.nl.crt"; sourceTree = "<group>"; };
                4C8E99C20FC601D50072EB4C /* SecFrameworkStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecFrameworkStrings.h; sourceTree = "<group>"; };

-               4C8FD03D099D5C91006867B6 /* SecCertificate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecCertificate.h; path = trust/SecCertificate.h; sourceTree = "<group>"; };
-               4C8FD03E099D5C91006867B6 /* SecTrust.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecTrust.h; path = trust/SecTrust.h; sourceTree = "<group>"; };
+               4C8FD03D099D5C91006867B6 /* SecCertificate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecCertificate.h; path = trust/headers/SecCertificate.h; sourceTree = "<group>"; };
+               4C8FD03E099D5C91006867B6 /* SecTrust.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecTrust.h; path = trust/headers/SecTrust.h; sourceTree = "<group>"; };

                4C999BA10AB5F0BB0010451D /* NtlmGenerator.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = NtlmGenerator.c; sourceTree = "<group>"; };
                4C999BA20AB5F0BB0010451D /* NtlmGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NtlmGenerator.h; sourceTree = "<group>"; };
                4C999BA30AB5F0BB0010451D /* ntlmBlobPriv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ntlmBlobPriv.c; sourceTree = "<group>"; };
                4C999BA10AB5F0BB0010451D /* NtlmGenerator.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = NtlmGenerator.c; sourceTree = "<group>"; };
                4C999BA20AB5F0BB0010451D /* NtlmGenerator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NtlmGenerator.h; sourceTree = "<group>"; };
                4C999BA30AB5F0BB0010451D /* ntlmBlobPriv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ntlmBlobPriv.c; sourceTree = "<group>"; };


@@ -10046,17 +12193,17 @@
                4CA880C20DDBC87200D9A0F2 /* sslServer-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sslServer-entitlements.plist"; sourceTree = "<group>"; };
                4CA880C30DDBC87200D9A0F2 /* sslViewer-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sslViewer-entitlements.plist"; sourceTree = "<group>"; };
                4CAB97FD1114CC5300EFB38D /* README.keychain */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.keychain; sourceTree = "<group>"; };
                4CA880C20DDBC87200D9A0F2 /* sslServer-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sslServer-entitlements.plist"; sourceTree = "<group>"; };
                4CA880C30DDBC87200D9A0F2 /* sslViewer-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sslViewer-entitlements.plist"; sourceTree = "<group>"; };
                4CAB97FD1114CC5300EFB38D /* README.keychain */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.keychain; sourceTree = "<group>"; };

-               4CAC87D60B8F82720009C9FC /* SecIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentity.h; path = keychain/SecIdentity.h; sourceTree = "<group>"; };
+               4CAC87D60B8F82720009C9FC /* SecIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentity.h; path = keychain/headers/SecIdentity.h; sourceTree = "<group>"; };

                4CB7405F0A47498100D641BB /* Security.exp-in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "Security.exp-in"; sourceTree = "<group>"; };
                4CB740680A4749C800D641BB /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
                4CB740A30A47567C00D641BB /* security */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = security; sourceTree = BUILT_PRODUCTS_DIR; };
                4CB7405F0A47498100D641BB /* Security.exp-in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "Security.exp-in"; sourceTree = "<group>"; };
                4CB740680A4749C800D641BB /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
                4CB740A30A47567C00D641BB /* security */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = security; sourceTree = BUILT_PRODUCTS_DIR; };

-               4CBA0E860BB33C0000E72B55 /* SecPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPolicy.h; path = trust/SecPolicy.h; sourceTree = "<group>"; };
+               4CBA0E860BB33C0000E72B55 /* SecPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPolicy.h; path = trust/headers/SecPolicy.h; sourceTree = "<group>"; };

                4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
                4CC3D28F178F310B0070FCC4 /* PersistentState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PersistentState.h; sourceTree = "<group>"; };
                4CC3D290178F310C0070FCC4 /* PersistentState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PersistentState.m; sourceTree = "<group>"; };
                4CC92ABA15A3B3D900C6D578 /* testlist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testlist.h; sourceTree = "<group>"; };
                4CC92B1B15A3BF2F00C6D578 /* testmain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testmain.c; sourceTree = "<group>"; };
                4CBCE5A90BE7F69100FF81F5 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
                4CC3D28F178F310B0070FCC4 /* PersistentState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PersistentState.h; sourceTree = "<group>"; };
                4CC3D290178F310C0070FCC4 /* PersistentState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PersistentState.m; sourceTree = "<group>"; };
                4CC92ABA15A3B3D900C6D578 /* testlist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testlist.h; sourceTree = "<group>"; };
                4CC92B1B15A3BF2F00C6D578 /* testmain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testmain.c; sourceTree = "<group>"; };

-               4CCE0AD90D41797400DDBB21 /* SecIdentityPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentityPriv.h; path = keychain/SecIdentityPriv.h; sourceTree = "<group>"; };
+               4CCE0AD90D41797400DDBB21 /* SecIdentityPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentityPriv.h; path = keychain/headers/SecIdentityPriv.h; sourceTree = "<group>"; };

                4CCE0AE10D417A2700DDBB21 /* sslAppUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslAppUtils.h; sourceTree = "<group>"; };
                4CD3BA601106FF4D00BE8B75 /* SecECKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecECKey.h; sourceTree = "<group>"; };
                4CE5A54D09C796E200D27A3F /* sslViewer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sslViewer; sourceTree = BUILT_PRODUCTS_DIR; };
                4CCE0AE10D417A2700DDBB21 /* sslAppUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslAppUtils.h; sourceTree = "<group>"; };
                4CD3BA601106FF4D00BE8B75 /* SecECKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecECKey.h; sourceTree = "<group>"; };
                4CE5A54D09C796E200D27A3F /* sslViewer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sslViewer; sourceTree = BUILT_PRODUCTS_DIR; };


@@ -10073,35 +12220,54 @@
                4CE7EA561AEAE8D60067F5BD /* SecItemBackup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemBackup.h; sourceTree = "<group>"; };
                4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemInternal.h; sourceTree = "<group>"; };
                4CEF4CA70C5551FE00062475 /* SecCertificateInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateInternal.h; sourceTree = "<group>"; };
                4CE7EA561AEAE8D60067F5BD /* SecItemBackup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemBackup.h; sourceTree = "<group>"; };
                4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemInternal.h; 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>"; };
+               4CF0484A0A5D988F00268236 /* SecItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecItem.h; path = keychain/headers/SecItem.h; sourceTree = "<group>"; };
+               4CF0487F0A5F016300268236 /* SecItemPriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SecItemPriv.h; path = keychain/headers/SecItemPriv.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>"; };
                52222CC0167BDAE100EDD09C /* SpringBoardServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpringBoardServices.framework; path = System/Library/PrivateFrameworks/SpringBoardServices.framework; sourceTree = SDKROOT; };
                522B28081E64B48E002B5638 /* secd-230-keybagtable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-230-keybagtable.m"; 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>"; };
                52222CC0167BDAE100EDD09C /* SpringBoardServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SpringBoardServices.framework; path = System/Library/PrivateFrameworks/SpringBoardServices.framework; sourceTree = SDKROOT; };
                522B28081E64B48E002B5638 /* secd-230-keybagtable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-230-keybagtable.m"; sourceTree = "<group>"; };

-               524492931AFD6D480043695A /* der_plist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_plist.h; path = src/der_plist.h; sourceTree = "<group>"; };
-               526965CB1E6E283100627F9D /* AsymKeybagBackup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsymKeybagBackup.h; sourceTree = "<group>"; };
-               526965CC1E6E283100627F9D /* AsymKeybagBackup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsymKeybagBackup.m; sourceTree = "<group>"; };
+               524492931AFD6D480043695A /* der_plist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = der_plist.h; sourceTree = "<group>"; };

                52A23EDB161DEC3700E271E0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "SecurityTests/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
                52AA92871E662A4A004301A6 /* SecBackupKeybagEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBackupKeybagEntry.h; sourceTree = "<group>"; };
                52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecBackupKeybagEntry.m; sourceTree = "<group>"; };
                52D82BD316A5EADA0078DFE5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
                52D82BDE16A621F70078DFE5 /* CloudKeychainProxy.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CloudKeychainProxy.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                52A23EDB161DEC3700E271E0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "SecurityTests/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
                52AA92871E662A4A004301A6 /* SecBackupKeybagEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBackupKeybagEntry.h; sourceTree = "<group>"; };
                52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecBackupKeybagEntry.m; sourceTree = "<group>"; };
                52D82BD316A5EADA0078DFE5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
                52D82BDE16A621F70078DFE5 /* CloudKeychainProxy.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CloudKeychainProxy.bundle; sourceTree = BUILT_PRODUCTS_DIR; };

+               52DA3C6F23C7E63500FEEDFF /* KCTLKRequestTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCTLKRequestTest.m; path = Tests/KCTLKRequestTest.m; sourceTree = "<group>"; };

                5346480117331E1200FE9172 /* KeychainSyncAccountNotification.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainSyncAccountNotification.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                5346480517331E1200FE9172 /* KeychainSyncAccountNotification-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "KeychainSyncAccountNotification-Info.plist"; sourceTree = "<group>"; };
                5346480717331E1200FE9172 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                5346480A17331E1200FE9172 /* KeychainSyncAccountNotification-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KeychainSyncAccountNotification-Prefix.pch"; 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>"; };
                5346480117331E1200FE9172 /* KeychainSyncAccountNotification.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainSyncAccountNotification.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                5346480517331E1200FE9172 /* KeychainSyncAccountNotification-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "KeychainSyncAccountNotification-Info.plist"; sourceTree = "<group>"; };
                5346480717331E1200FE9172 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                5346480A17331E1200FE9172 /* KeychainSyncAccountNotification-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KeychainSyncAccountNotification-Prefix.pch"; 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>"; };
-               5A4E381A207529480047F40F /* SecProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocol.h; path = protocol/SecProtocol.h; 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; };
-               5AC6BFA52077CD130051737D /* SecProtocolTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolTypes.h; path = protocol/SecProtocolTypes.h; sourceTree = "<group>"; };
-               5AFCF32220746AD80010D4B5 /* SecProtocolOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolOptions.h; path = protocol/SecProtocolOptions.h; sourceTree = "<group>"; };
-               5AFCF32820746AE90010D4B5 /* SecProtocolMetadata.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolMetadata.h; path = protocol/SecProtocolMetadata.h; sourceTree = "<group>"; };
-               5AFCF32D20746D9A0010D4B5 /* SecProtocolObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolObject.h; path = protocol/SecProtocolObject.h; sourceTree = "<group>"; };
+               53C0E1F2177FAC2C00F8A018 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/CloudKeychain.strings; sourceTree = "<group>"; };
+               5A04BAF622973E43001848A0 /* OTFollowup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTFollowup.h; sourceTree = "<group>"; };
+               5A04BAF722973E43001848A0 /* OTFollowup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTFollowup.m; sourceTree = "<group>"; };
+               5A04BAF922973EA9001848A0 /* OTFollowupTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OTFollowupTests.m; path = keychain/ot/tests/OTFollowupTests.m; sourceTree = SOURCE_ROOT; };
+               5A04BB14229866F7001848A0 /* SecXPCHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecXPCHelper.m; sourceTree = "<group>"; };
+               5A04BB182298670C001848A0 /* SecXPCHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecXPCHelper.h; sourceTree = "<group>"; };
+               5A04BB22229872CB001848A0 /* SecXPCHelperTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecXPCHelperTests.m; sourceTree = "<group>"; };
+               5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+SFAnalytics.m"; sourceTree = "<group>"; };
+               5A061190229ED60C006AF14A /* NSDate+SFAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+SFAnalytics.h"; sourceTree = "<group>"; };
+               5A1A1C2122A71D2A00CB8D1D /* NSDate+SFAnalyticsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+SFAnalyticsTests.m"; sourceTree = "<group>"; };
+               5A43A07F225FA38D005450E4 /* SecProtocolHelperTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecProtocolHelperTest.m; path = protocol/SecProtocolHelperTest.m; sourceTree = "<group>"; };
+               5A442F90233C330F00918373 /* experimentTool */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = experimentTool; sourceTree = BUILT_PRODUCTS_DIR; };
+               5A442F98233C34C000918373 /* SecExperimentPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecExperimentPriv.h; sourceTree = "<group>"; };
+               5A442F9A233C34C000918373 /* SecExperimentTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecExperimentTests.m; sourceTree = "<group>"; };
+               5A442F9B233C34C000918373 /* SecExperimentInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecExperimentInternal.h; sourceTree = "<group>"; };
+               5A442F9C233C34C000918373 /* SecExperiment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecExperiment.m; sourceTree = "<group>"; };
+               5A442F9E233C34C000918373 /* experimentTool-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "experimentTool-Entitlements.plist"; sourceTree = "<group>"; };
+               5A442F9F233C34C000918373 /* experimentTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = experimentTool.m; sourceTree = "<group>"; };
+               5A47FFB1228F5DF700F781B8 /* KCInitialMessageData.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = KCInitialMessageData.proto; sourceTree = "<group>"; };
+               5A47FFB4228F5E9000F781B8 /* KCInitialMessageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KCInitialMessageData.h; path = generated_source/KCInitialMessageData.h; sourceTree = "<group>"; };
+               5A47FFB5228F5E9000F781B8 /* KCInitialMessageData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCInitialMessageData.m; path = generated_source/KCInitialMessageData.m; sourceTree = "<group>"; };
+               5A6D1B8D20810EA30057CAC8 /* SecProtocolMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecProtocolMetadata.h; path = protocol/SecProtocolMetadata.h; sourceTree = "<group>"; };
+               5A6D1B9320810EA30057CAC8 /* SecProtocolOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecProtocolOptions.h; path = protocol/SecProtocolOptions.h; sourceTree = "<group>"; };
+               5A6D1B9420810EA40057CAC8 /* SecProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecProtocolTypes.h; path = protocol/SecProtocolTypes.h; sourceTree = "<group>"; };
+               5A7E037722272C2D003DB3A0 /* SecProtocolHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecProtocolHelper.m; path = protocol/SecProtocolHelper.m; sourceTree = "<group>"; };
+               5AE4BEEE1FA79456001B9DA4 /* SecProtocolObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolObject.h; path = protocol/SecProtocolObject.h; sourceTree = "<group>"; };
+               5AF593FE1FA0EE5300A5C1EC /* SecProtocol.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = SecProtocol.c; path = protocol/SecProtocol.c; sourceTree = "<group>"; };
+               5AF594011FA1051500A5C1EC /* SecProtocolPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolPriv.h; path = protocol/SecProtocolPriv.h; sourceTree = "<group>"; };

                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>"; };
                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>"; };


@@ -10119,18 +12285,58 @@
                5EAFA4CD1EF16059002DC188 /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; };
                5EBE247A1B00CCAE0007DB0E /* secacltests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secacltests; sourceTree = BUILT_PRODUCTS_DIR; };
                5EBE247C1B00CCAE0007DB0E /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
                5EAFA4CD1EF16059002DC188 /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; };
                5EBE247A1B00CCAE0007DB0E /* secacltests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secacltests; sourceTree = BUILT_PRODUCTS_DIR; };
                5EBE247C1B00CCAE0007DB0E /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };

+               5F00F95A230614A200B832E0 /* SecImportExportPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecImportExportPriv.h; path = keychain/headers/SecImportExportPriv.h; sourceTree = "<group>"; };
+               5F4C21FE2489C68900F0C425 /* simulatecrash_assert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = simulatecrash_assert.h; sourceTree = "<group>"; };
+               5F8494FF22DFB502008B3EFB /* SecTrustExceptionResetCount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecTrustExceptionResetCount.m; sourceTree = "<group>"; };
+               617570BA22C2D19E00EFBA37 /* Security.macOS.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = Security.macOS.private.modulemap; path = Modules/Security.macOS.private.modulemap; sourceTree = "<group>"; };
+               61BDC97E242932A100A2ABD8 /* SecTranslocateEnumUtils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = SecTranslocateEnumUtils.hpp; sourceTree = "<group>"; };
+               6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecDbBackupTests.m; path = tests/SecDbBackupTests/SecDbBackupTests.m; sourceTree = SOURCE_ROOT; };
+               6C02134F21F7ED45009D5C80 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = tests/SecDbBackupTests/Info.plist; sourceTree = SOURCE_ROOT; };

                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; };
                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; };

+               6C0C807420EAF81900334E33 /* TPPBPolicyDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyDocument.h; sourceTree = "<group>"; };
+               6C0C807520EAF81900334E33 /* TPPBPolicyDocument.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyDocument.m; sourceTree = "<group>"; };
+               6C0C807D20EAF86100334E33 /* TPPBPolicyDocument.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyDocument.proto; sourceTree = "<group>"; };
+               6C0C807F20EAFB9600334E33 /* TPPBPolicyCategoriesByView.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyCategoriesByView.proto; sourceTree = "<group>"; };
+               6C0C808020EAFB9600334E33 /* TPPBPolicyModelToCategory.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyModelToCategory.proto; sourceTree = "<group>"; };
+               6C0C808320EAFD7A00334E33 /* TPPBPolicyIntroducersByCategory.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyIntroducersByCategory.proto; sourceTree = "<group>"; };
+               6C0C809520EB024800334E33 /* TPPBPolicyIntroducersByCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyIntroducersByCategory.m; sourceTree = "<group>"; };
+               6C0C809620EB024800334E33 /* TPPBPolicyCategoriesByView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyCategoriesByView.h; sourceTree = "<group>"; };
+               6C0C809720EB024900334E33 /* TPPBPolicyIntroducersByCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyIntroducersByCategory.h; sourceTree = "<group>"; };
+               6C0C809820EB024900334E33 /* TPPBPolicyModelToCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyModelToCategory.h; sourceTree = "<group>"; };
+               6C0C809920EB024900334E33 /* TPPBPolicyModelToCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyModelToCategory.m; sourceTree = "<group>"; };

                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>"; };
                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>"; };

+               6C2008EF220BB4B500674B3A /* SecDbBackupTests-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SecDbBackupTests-Entitlements.plist"; sourceTree = "<group>"; };
+               6C2045EA2424BA7E00F9461D /* KeychainStasher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = KeychainStasher; sourceTree = BUILT_PRODUCTS_DIR; };
+               6C2045F92424BCB800F9461D /* com.apple.security.KeychainStasher.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.KeychainStasher.plist; sourceTree = "<group>"; };
+               6C23F02C227A39E9009F6756 /* com.apple.securityd.sb */ = {isa = PBXFileReference; lastKnownFileType = text; name = com.apple.securityd.sb; path = securityd/etc/com.apple.securityd.sb; sourceTree = SOURCE_ROOT; };
+               6C2D463924C88A700015C3C9 /* LegacyAPICounts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyAPICounts.h; sourceTree = "<group>"; };
+               6C2D463B24C88A870015C3C9 /* LegacyAPICounts.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LegacyAPICounts.m; sourceTree = "<group>"; };

                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSRateLimiterTests.m; sourceTree = "<group>"; };
                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSRateLimiterTests.m; sourceTree = "<group>"; };

+               6C39237921F13E4D00D018AD /* SecDbBackupTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecDbBackupTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };

                6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainAnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainAnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };

+               6C48D10D2423A2F3004AF950 /* KeychainStasher.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KeychainStasher.entitlements; sourceTree = "<group>"; };
+               6C48D10F2423A3C0004AF950 /* com.apple.security.KeychainStasher.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.security.KeychainStasher.sb; sourceTree = "<group>"; };
+               6C4AEF82218A09210012C5DA /* CheckV12DevEnabled.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CheckV12DevEnabled.h; sourceTree = "<group>"; };
+               6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CheckV12DevEnabled.m; sourceTree = "<group>"; };
+               6C4AEF8A218A0A400012C5DA /* SecDbBackupManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbBackupManager.h; sourceTree = "<group>"; };
+               6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupManager.m; sourceTree = "<group>"; };
+               6C4AEF92218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainMetadataKeyStore.h; sourceTree = "<group>"; };
+               6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainMetadataKeyStore.m; sourceTree = "<group>"; };
+               6C4AEF9C218A16F80012C5DA /* SecAKSObjCWrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAKSObjCWrappers.h; sourceTree = "<group>"; };
+               6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecAKSObjCWrappers.m; sourceTree = "<group>"; };
+               6C513A37244F007B00207D5E /* SecItemRateLimit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecItemRateLimit.h; sourceTree = "<group>"; };
+               6C513A38244F007B00207D5E /* SecItemRateLimit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecItemRateLimit.m; sourceTree = "<group>"; };

                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; };
                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; };

+               6C54BE0C23F41497004716CB /* SystemEntitlements.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemEntitlements.h; sourceTree = "<group>"; };

                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>"; };
                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>"; };

+               6C5D62A5221B6E3F00AF79DC /* secdxctests-entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "secdxctests-entitlements.plist"; sourceTree = "<group>"; };
+               6C6579FC2394878700701C8B /* SecDbBackupTestsBase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupTestsBase.m; 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>"; };
                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>"; };


@@ -10139,27 +12345,57 @@
                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>"; };
                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>"; };

+               6C6AF178221A03930091CE0A /* SecDbKeychainSerializedMetadataKey.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = SecDbKeychainSerializedMetadataKey.proto; sourceTree = "<group>"; };
+               6C6AF17D221A06F70091CE0A /* SecDbKeychainSerializedMetadataKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbKeychainSerializedMetadataKey.h; sourceTree = "<group>"; };
+               6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbKeychainSerializedMetadataKey.m; sourceTree = "<group>"; };
+               6C70D8D420EB02B700AB6FAF /* TPPBPolicyCategoriesByView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyCategoriesByView.m; sourceTree = "<group>"; };
+               6C70D8D520EBDE4500AB6FAF /* TPPBPolicyRedaction.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyRedaction.proto; sourceTree = "<group>"; };
+               6C70D8DD20EBDFD600AB6FAF /* TPPBPolicyRedaction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyRedaction.m; sourceTree = "<group>"; };
+               6C70D8DE20EBDFD700AB6FAF /* TPPBPolicyRedaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyRedaction.h; sourceTree = "<group>"; };
+               6C755603242121F000025D78 /* keychainstasherinterface.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = keychainstasherinterface.m; sourceTree = "<group>"; };
+               6C755604242121F000025D78 /* keychainstasherinterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = keychainstasherinterface.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; };
                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; };

+               6C7BE2E723C3DD64003BB2CA /* securitytool_bridge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securitytool_bridge; sourceTree = BUILT_PRODUCTS_DIR; };

                6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalKeychainAnalytics.h; sourceTree = "<group>"; };
                6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocalKeychainAnalytics.m; sourceTree = "<group>"; };
                6C814A4A2050B4B600CB391B /* LocalKeychainAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalKeychainAnalytics.h; sourceTree = "<group>"; };
                6C814A4B2050B4B600CB391B /* LocalKeychainAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocalKeychainAnalytics.m; sourceTree = "<group>"; };

+               6C84E3C723ECBC84003C9710 /* KeychainAppClipTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainAppClipTests.m; sourceTree = "<group>"; };

                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>"; };
                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>"; };

+               6C880FBE21C334FB00D38D66 /* SecDbBackupBagIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupBagIdentity.h; sourceTree = "<group>"; };
+               6C880FBF21C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupKeyClassSigningKey.h; sourceTree = "<group>"; };
+               6C880FC021C334FC00D38D66 /* SecDbBackupRecoverySet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupRecoverySet.m; sourceTree = "<group>"; };
+               6C880FC121C334FC00D38D66 /* SecDbBackupMetadataClassKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupMetadataClassKey.m; sourceTree = "<group>"; };
+               6C880FC221C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupKeyClassSigningKey.m; sourceTree = "<group>"; };
+               6C880FC321C334FD00D38D66 /* SecDbBackupBag.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupBag.m; sourceTree = "<group>"; };
+               6C880FC421C334FD00D38D66 /* SecDbBackupBag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupBag.h; sourceTree = "<group>"; };
+               6C880FC521C334FD00D38D66 /* SecDbBackupMetadataClassKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupMetadataClassKey.h; sourceTree = "<group>"; };
+               6C880FC621C334FE00D38D66 /* SecDbBackupBagIdentity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecDbBackupBagIdentity.m; sourceTree = "<group>"; };
+               6C880FC721C334FE00D38D66 /* SecDbBackupRecoverySet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupRecoverySet.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>"; };
                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; };
+               6C915BE3242E14BC00DBDAFB /* SecDbInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbInternal.h; sourceTree = "<group>"; };
+               6C963281242A279B00C53CE2 /* stashtester */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = stashtester; sourceTree = BUILT_PRODUCTS_DIR; };
+               6C963283242A279B00C53CE2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               6C963289242A27F300C53CE2 /* stashtester.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = stashtester.entitlements; sourceTree = "<group>"; };
+               6C9791C421C17D060074C609 /* SecDbBackupManager_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbBackupManager_Internal.h; sourceTree = "<group>"; };
+               6C997869242362EC008C498D /* KeychainStasherProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainStasherProtocol.h; sourceTree = "<group>"; };
+               6C99786A242362EC008C498D /* KeychainStasher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainStasher.h; sourceTree = "<group>"; };
+               6C99786B242362EC008C498D /* KeychainStasher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainStasher.m; sourceTree = "<group>"; };
+               6C99786D242362EC008C498D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               6C99786F242362EC008C498D /* KeychainStasher-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "KeychainStasher-Info.plist"; sourceTree = "<group>"; };
+               6C997879242364E5008C498D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+               6C99787C242364FB008C498D /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.16.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_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>"; };
                6CA837612210C5E7002770F1 /* kc-45-change-password.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "kc-45-change-password.c"; path = "regressions/kc-45-change-password.c"; sourceTree = "<group>"; };
                6CAA8D201F842FB3007B6E03 /* securityuploadd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityuploadd; 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>"; };
                6CA837612210C5E7002770F1 /* kc-45-change-password.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "kc-45-change-password.c"; path = "regressions/kc-45-change-password.c"; 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>"; };
+               6CB5F4791E402E5700DBF3F0 /* KeychainEntitledTestRunner.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = KeychainEntitledTestRunner.entitlements; sourceTree = "<group>"; };

                6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeychainEntitledTestRunner.m; sourceTree = "<group>"; };
                6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeychainEntitledTestRunner.m; sourceTree = "<group>"; };

+               6CB6CC022198D4BC0080AD6F /* SecDbBackupRecoverySet.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = SecDbBackupRecoverySet.proto; 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>"; };
                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>"; };


@@ -10169,7 +12405,8 @@
                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; };
                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>"; };
+               6CD224E7239493E8001B70FD /* SecDbBackupTestsBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbBackupTestsBase.h; sourceTree = "<group>"; };
+               6CD8412B23F5D871003DDF34 /* KeychainBackupTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainBackupTests.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>"; };
                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>"; };


@@ -10177,6 +12414,9 @@
                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; };
                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; };

+               6CF1B5C5245077E400FD8CC4 /* SecItemRateLimit_tests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecItemRateLimit_tests.h; sourceTree = "<group>"; };
+               6CF33CA2238714C900D1E75D /* bats_utd_plist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bats_utd_plist.h; sourceTree = "<group>"; };
+               6CF33CA4238714C900D1E75D /* PreprocessPlist.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = PreprocessPlist.sh; sourceTree = "<group>"; };

                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>"; };
                6CF4A0B71E45488B00ECD7B5 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
                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>"; };
                6CF4A0B71E45488B00ECD7B5 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };


@@ -10184,21 +12424,11 @@
                6CF4A0BC1E45488B00ECD7B5 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
                6CF4A0BD1E45488B00ECD7B5 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
                6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
                6CF4A0BC1E45488B00ECD7B5 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
                6CF4A0BD1E45488B00ECD7B5 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
                6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };

-               6CF4A0C21E45488B00ECD7B5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-               6CF4A0C41E45488B00ECD7B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               6CF4A0E01E4549F200ECD7B5 /* KeychainEntitledTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KeychainEntitledTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               6CF4A0E31E4549F200ECD7B5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-               6CF4A0E51E4549F200ECD7B5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-               6CF4A0E61E4549F300ECD7B5 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-               6CF4A0E81E4549F300ECD7B5 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-               6CF4A0E91E4549F300ECD7B5 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-               6CF4A0EC1E4549F300ECD7B5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; 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>"; };
+               6CF4A0C41E45488B00ECD7B5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; 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; };
                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>"; };
+               7221843E1EC6782A004C7BED /* sec_action.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sec_action.c; sourceTree = "<group>"; };
+               7221843F1EC6782A004C7BED /* sec_action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sec_action.h; sourceTree = "<group>"; };
+               725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = xcconfig/swift_binary_shim.xcconfig; 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>"; };
                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>"; };


@@ -10206,33 +12436,22 @@
                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; };
                72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secdmock_db_version_10_5.h; sourceTree = "<group>"; };
                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; };
                72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secdmock_db_version_10_5.h; sourceTree = "<group>"; };

+               78ADC6251FA0FAC5001EB8B6 /* SecProtocolTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecProtocolTypes.m; path = protocol/SecProtocolTypes.m; sourceTree = "<group>"; };

                78F92F10195128D70023B54B /* SecECKeyPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecECKeyPriv.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>"; };
-               7901791012D51F7200CA4D44 /* SecCmsDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsDecoder.h; sourceTree = "<group>"; };
-               7901791112D51F7200CA4D44 /* SecCmsDigestContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsDigestContext.h; sourceTree = "<group>"; };
-               7901791212D51F7200CA4D44 /* SecCmsEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsEncoder.h; sourceTree = "<group>"; };
-               7901791312D51F7200CA4D44 /* SecCmsEnvelopedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsEnvelopedData.h; sourceTree = "<group>"; };
-               7901791412D51F7200CA4D44 /* SecCmsMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsMessage.h; sourceTree = "<group>"; };
-               7901791512D51F7200CA4D44 /* SecCmsRecipientInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsRecipientInfo.h; sourceTree = "<group>"; };
-               7901791612D51F7200CA4D44 /* SecCmsSignedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsSignedData.h; sourceTree = "<group>"; };
-               7901791712D51F7200CA4D44 /* SecCmsSignerInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsSignerInfo.h; sourceTree = "<group>"; };

                7908507F0CA87CF00083CC4D /* client.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = client.c; sourceTree = "<group>"; };
                790850820CA87CF00083CC4D /* securityd_client.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = securityd_client.h; sourceTree = "<group>"; };
                790850840CA87CF00083CC4D /* server.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = server.c; sourceTree = "<group>"; };
                790851B60CA9859F0083CC4D /* securityd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityd; sourceTree = BUILT_PRODUCTS_DIR; };
                7913B1DF0D17280500601FE9 /* sslServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sslServer.cpp; sourceTree = "<group>"; };
                7913B2110D172B3900601FE9 /* sslServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sslServer; sourceTree = BUILT_PRODUCTS_DIR; };
                7908507F0CA87CF00083CC4D /* client.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = client.c; sourceTree = "<group>"; };
                790850820CA87CF00083CC4D /* securityd_client.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = securityd_client.h; sourceTree = "<group>"; };
                790850840CA87CF00083CC4D /* server.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = server.c; sourceTree = "<group>"; };
                790851B60CA9859F0083CC4D /* securityd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = securityd; sourceTree = BUILT_PRODUCTS_DIR; };
                7913B1DF0D17280500601FE9 /* sslServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sslServer.cpp; sourceTree = "<group>"; };
                7913B2110D172B3900601FE9 /* sslServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sslServer; sourceTree = BUILT_PRODUCTS_DIR; };

-               791766DD0DD0162C00F3B974 /* SecCertificateRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateRequest.h; path = trust/SecCertificateRequest.h; sourceTree = "<group>"; };
+               791766DD0DD0162C00F3B974 /* SecCertificateRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateRequest.h; path = trust/headers/SecCertificateRequest.h; sourceTree = "<group>"; };

                7940D4110C3ACF9000FDB5D8 /* SecDH.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SecDH.h; sourceTree = "<group>"; };
                794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-www.cybersecurity.my.crt"; sourceTree = "<group>"; };
                7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Digisign-Server-ID-Enrich-GTETrust-Cert.crt"; sourceTree = "<group>"; };
                795CA9CC0D38435E00BAE6A2 /* p12pbegen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = p12pbegen.h; sourceTree = "<group>"; };
                79679E251462028800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Digisign-Server-ID-Enrich-Entrust-Cert.crt"; sourceTree = "<group>"; };
                79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-webmail.jaring.my.crt"; sourceTree = "<group>"; };
                7940D4110C3ACF9000FDB5D8 /* SecDH.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SecDH.h; sourceTree = "<group>"; };
                794743191462137C00D638A3 /* Invalid-www.cybersecurity.my.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-www.cybersecurity.my.crt"; sourceTree = "<group>"; };
                7947431C146214E500D638A3 /* Digisign-Server-ID-Enrich-GTETrust-Cert.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Digisign-Server-ID-Enrich-GTETrust-Cert.crt"; sourceTree = "<group>"; };
                795CA9CC0D38435E00BAE6A2 /* p12pbegen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = p12pbegen.h; sourceTree = "<group>"; };
                79679E251462028800CF997F /* Digisign-Server-ID-Enrich-Entrust-Cert.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Digisign-Server-ID-Enrich-Entrust-Cert.crt"; sourceTree = "<group>"; };
                79679E261462028800CF997F /* Invalid-webmail.jaring.my.crt */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Invalid-webmail.jaring.my.crt"; sourceTree = "<group>"; };

-               79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libCMS.xcodeproj; path = ../../../libsecurity_smime/libCMS.xcodeproj; sourceTree = "<group>"; };
-               79BDD3C00D60DB84000D84D3 /* SecCMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCMS.h; sourceTree = "<group>"; };
-               79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecImportExport.h; path = keychain/SecImportExport.h; sourceTree = "<group>"; };
+               79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecImportExport.h; path = keychain/headers/SecImportExport.h; sourceTree = "<group>"; };

                79EF5B720D3D6AFE009F5270 /* p12import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = p12import.h; sourceTree = "<group>"; };
                8E02FA691107BE460043545E /* pbkdf2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pbkdf2.h; sourceTree = "<group>"; };
                8E64DB4C1C17CD3F0076C9DF /* com.apple.security.cloudkeychainproxy3.ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.security.cloudkeychainproxy3.ios.plist; path = KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.ios.plist; sourceTree = "<group>"; };
                79EF5B720D3D6AFE009F5270 /* p12import.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = p12import.h; sourceTree = "<group>"; };
                8E02FA691107BE460043545E /* pbkdf2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pbkdf2.h; sourceTree = "<group>"; };
                8E64DB4C1C17CD3F0076C9DF /* com.apple.security.cloudkeychainproxy3.ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.security.cloudkeychainproxy3.ios.plist; path = KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.ios.plist; sourceTree = "<group>"; };


@@ -10240,17 +12459,25 @@
                8ED6F6C8110904E300D2B368 /* SecPBKDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPBKDF.h; sourceTree = "<group>"; };
                A6B1BA78207BD9D400F1E099 /* notarization.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = notarization.cpp; sourceTree = "<group>"; };
                A6B1BA79207BD9D400F1E099 /* notarization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = notarization.h; sourceTree = "<group>"; };
                8ED6F6C8110904E300D2B368 /* SecPBKDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPBKDF.h; sourceTree = "<group>"; };
                A6B1BA78207BD9D400F1E099 /* notarization.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = notarization.cpp; sourceTree = "<group>"; };
                A6B1BA79207BD9D400F1E099 /* notarization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = notarization.h; sourceTree = "<group>"; };

-               AA44E0D02032513F001EA371 /* SecProtocol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecProtocol.c; path = protocol/SecProtocol.c; sourceTree = SOURCE_ROOT; };
-               AA44E0D120325140001EA371 /* SecProtocolTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecProtocolTypes.m; path = protocol/SecProtocolTypes.m; sourceTree = SOURCE_ROOT; };
-               AA44E0D920325177001EA371 /* SecProtocolPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecProtocolPriv.h; path = protocol/SecProtocolPriv.h; sourceTree = "<group>"; };
+               A6BF3B3123EB94A7009AF079 /* entitlements.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = entitlements.h; sourceTree = "<group>"; };
+               A6BF3B3223EB94A7009AF079 /* entitlements.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = entitlements.c; sourceTree = "<group>"; };
+               AA0DA47821E8189D009F1C74 /* example1.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = example1.json; path = protocol/test_data/example1.json; sourceTree = "<group>"; };
+               AA0DA47921E8189E009F1C74 /* builtins.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = builtins.json; path = protocol/test_data/builtins.json; sourceTree = "<group>"; };
+               AA44E0B3202E3451001EA371 /* SecProtocolTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecProtocolTest.m; path = protocol/SecProtocolTest.m; sourceTree = "<group>"; };
+               AA9FD5982152AFC00045A07A /* SecProtocolConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolConfiguration.h; path = protocol/SecProtocolConfiguration.h; sourceTree = "<group>"; };
+               AA9FD59B2152AFD70045A07A /* SecProtocolConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecProtocolConfiguration.m; path = protocol/SecProtocolConfiguration.m; sourceTree = "<group>"; };
+               AAD66304203362480073E17B /* libnetwork.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libnetwork.tbd; path = usr/lib/libnetwork.tbd; sourceTree = SDKROOT; };
+               AADD4A28215E82440054FC6D /* SecProtocolInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolInternal.h; path = protocol/SecProtocolInternal.h; sourceTree = "<group>"; };
+               AADD4A2B215E83140054FC6D /* SecProtocolConfigurationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecProtocolConfigurationTest.m; path = protocol/SecProtocolConfigurationTest.m; sourceTree = "<group>"; };
+               AAE91C542162634200B6BF0B /* SecProtocolTypesPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecProtocolTypesPriv.h; path = protocol/SecProtocolTypesPriv.h; sourceTree = "<group>"; };

                ACBAF6DD1E9417F40007BA2F /* libsecurity_transform_regressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_transform_regressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                ACBAF6E31E941AE00007BA2F /* transform_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transform_regressions.h; path = OSX/libsecurity_transform/regressions/transform_regressions.h; sourceTree = "<group>"; };
                ACBAF6E51E941AE00007BA2F /* transform-01-sigverify.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "transform-01-sigverify.m"; path = "OSX/libsecurity_transform/regressions/transform-01-sigverify.m"; sourceTree = "<group>"; };
                ACBAF6FF1E947E860007BA2F /* testlist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = testlist.h; path = OSX/SecurityTestsOSX/testlist.h; sourceTree = "<group>"; };
                B61577EE1F2021BC004A3930 /* padding-00-mmcs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "padding-00-mmcs.c"; sourceTree = "<group>"; };
                ACBAF6DD1E9417F40007BA2F /* libsecurity_transform_regressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_transform_regressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                ACBAF6E31E941AE00007BA2F /* transform_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transform_regressions.h; path = OSX/libsecurity_transform/regressions/transform_regressions.h; sourceTree = "<group>"; };
                ACBAF6E51E941AE00007BA2F /* transform-01-sigverify.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "transform-01-sigverify.m"; path = "OSX/libsecurity_transform/regressions/transform-01-sigverify.m"; sourceTree = "<group>"; };
                ACBAF6FF1E947E860007BA2F /* testlist.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = testlist.h; path = OSX/SecurityTestsOSX/testlist.h; sourceTree = "<group>"; };
                B61577EE1F2021BC004A3930 /* padding-00-mmcs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "padding-00-mmcs.c"; sourceTree = "<group>"; };

-               B61F67541F1FCFCA00E2FDBB /* SecPaddingConfigurationsPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecPaddingConfigurationsPriv.h; path = src/SecPaddingConfigurationsPriv.h; sourceTree = "<group>"; };
-               B61F67551F1FCFCA00E2FDBB /* SecPaddingConfigurations.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = SecPaddingConfigurations.c; path = src/SecPaddingConfigurations.c; sourceTree = "<group>"; };
-               BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecSharedCredential.h; path = ../../../keychain/SecSharedCredential.h; sourceTree = "<group>"; };
+               B61F67541F1FCFCA00E2FDBB /* SecPaddingConfigurationsPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPaddingConfigurationsPriv.h; sourceTree = "<group>"; };
+               B61F67551F1FCFCA00E2FDBB /* SecPaddingConfigurations.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecPaddingConfigurations.c; sourceTree = "<group>"; };
+               BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecSharedCredential.h; path = keychain/headers/SecSharedCredential.h; sourceTree = "<group>"; };

                BE197F2619116FD100BA91D1 /* SharedWebCredentialViewService.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWebCredentialViewService.app; sourceTree = BUILT_PRODUCTS_DIR; };
                BE197F2919116FD100BA91D1 /* SharedWebCredentialViewService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SharedWebCredentialViewService-Info.plist"; sourceTree = "<group>"; };
                BE197F2B19116FD100BA91D1 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                BE197F2619116FD100BA91D1 /* SharedWebCredentialViewService.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWebCredentialViewService.app; sourceTree = BUILT_PRODUCTS_DIR; };
                BE197F2919116FD100BA91D1 /* SharedWebCredentialViewService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SharedWebCredentialViewService-Info.plist"; sourceTree = "<group>"; };
                BE197F2B19116FD100BA91D1 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };


@@ -10270,38 +12497,85 @@
                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>"; };
                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>"; };
                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>"; };

-               BE4AC9B918B8273600B84964 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/SharedWebCredentials.strings; 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>"; };
+               BE4AC9B918B8273600B84964 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/SharedWebCredentials.strings; sourceTree = "<group>"; };
+               BE4C6AB120CAF4E500EAD6BE /* ContainerSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerSync.swift; sourceTree = "<group>"; };
+               BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libMobileGestalt.tbd; path = usr/lib/libMobileGestalt.tbd; sourceTree = SDKROOT; };
+               BE55C77A2044D0C80045863D /* TrustedPeersHelper-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TrustedPeersHelper-Bridging-Header.h"; sourceTree = "<group>"; };
+               BE55C77B2044D0C90045863D /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+               BE55C77D2044D7E60045863D /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+               BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ca_revocation_additions.m; sourceTree = "<group>"; };
+               BE64A7FD22AF0109001209F3 /* trusted_cert_ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = trusted_cert_ssl.h; sourceTree = "<group>"; };
+               BE64A7FE22AF010A001209F3 /* trusted_cert_ssl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = trusted_cert_ssl.m; sourceTree = "<group>"; };
+               BE7089911F9AA027001ACC20 /* TPPBVoucher.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBVoucher.proto; sourceTree = "<group>"; };
+               BE70899A1F9AAFF7001ACC20 /* TPPBVoucher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBVoucher.h; sourceTree = "<group>"; };
+               BE70899B1F9AAFF7001ACC20 /* TPPBVoucher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBVoucher.m; sourceTree = "<group>"; };
+               BE7089CB1FA3B19A001ACC20 /* TPPBPeerDynamicInfo.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPeerDynamicInfo.proto; sourceTree = "<group>"; };
+               BE7089CC1FA3B332001ACC20 /* TPPBPeerStableInfo.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPeerStableInfo.proto; sourceTree = "<group>"; };
+               BE7089CF1FA3BA01001ACC20 /* TPPBPeerDynamicInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPeerDynamicInfo.h; sourceTree = "<group>"; };
+               BE7089D01FA3BA01001ACC20 /* TPPBPolicySecret.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicySecret.m; sourceTree = "<group>"; };
+               BE7089D11FA3BA02001ACC20 /* TPPBPeerStableInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPeerStableInfo.m; sourceTree = "<group>"; };
+               BE7089D21FA3BA03001ACC20 /* TPPBPeerDynamicInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPeerDynamicInfo.m; sourceTree = "<group>"; };
+               BE7089D31FA3BA03001ACC20 /* TPPBPolicySecret.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPolicySecret.h; sourceTree = "<group>"; };
+               BE7089D41FA3BA04001ACC20 /* TPPBPeerStableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPeerStableInfo.h; sourceTree = "<group>"; };
+               BE7089D91FA3F0AF001ACC20 /* TPPBPolicySecret.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicySecret.proto; sourceTree = "<group>"; };
+               BE7089DB1FA407E4001ACC20 /* TPPBPeerPermanentInfo.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPeerPermanentInfo.proto; sourceTree = "<group>"; };
+               BE7089DD1FA40B93001ACC20 /* TPPBPeerPermanentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBPeerPermanentInfo.h; sourceTree = "<group>"; };
+               BE7089DE1FA40B95001ACC20 /* TPPBPeerPermanentInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBPeerPermanentInfo.m; sourceTree = "<group>"; };
+               BE72782A209D27C800F0DA77 /* TPKeyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPKeyTests.m; sourceTree = "<group>"; };
+               BE7B8E112415579800E1CF4F /* SecSharedCredential.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecSharedCredential.m; sourceTree = "<group>"; };

                BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
                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>"; };
+               BE92249D204F203C0052E828 /* TrustedPeersHelper.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrustedPeersHelper.xcdatamodel; sourceTree = "<group>"; };
+               BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cuttlefish.pb.swift; sourceTree = "<group>"; };
+               BE9F8D0F206C099800B53D16 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
+               BE9F8D11206C121400B53D16 /* Decrypter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Decrypter.swift; sourceTree = "<group>"; };
+               BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerMap.swift; sourceTree = "<group>"; };
+               BEA8557F20B5DC7D00D5AD11 /* FakeCuttlefish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeCuttlefish.swift; sourceTree = "<group>"; };
+               BEAA002B202A832500E51F45 /* TrustedPeersHelper.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = TrustedPeersHelper.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+               BEAA002D202A832500E51F45 /* TrustedPeersHelperProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrustedPeersHelperProtocol.h; sourceTree = "<group>"; };
+               BEAA0033202A832500E51F45 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               BEB49F29206E98CD008DA7F4 /* TPECPublicKeyFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPECPublicKeyFactory.h; sourceTree = "<group>"; };
+               BEB49F2F206E98CE008DA7F4 /* TPECPublicKeyFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPECPublicKeyFactory.m; sourceTree = "<group>"; };
+               BEB49F32206E9A18008DA7F4 /* SFKey+TPKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SFKey+TPKey.h"; sourceTree = "<group>"; };
+               BEB49F33206E9A19008DA7F4 /* SFKey+TPKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SFKey+TPKey.m"; sourceTree = "<group>"; };
+               BEB49F36206E9B89008DA7F4 /* TPECPublicKeyFactoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPECPublicKeyFactoryTests.m; sourceTree = "<group>"; };
+               BEC0A94920AB618700DBD772 /* Cuttlefish.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cuttlefish.proto; path = keychain/trust/cuttlefish/API/Cuttlefish.proto; sourceTree = SOURCE_ROOT; };
+               BEC0A96320B362EC00DBD772 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
+               BEC3739B20CF2AA200DBDF5B /* TPPBDisposition.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBDisposition.proto; sourceTree = "<group>"; };
+               BEC373A220CF3B5C00DBDF5B /* TPPBDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDisposition.h; sourceTree = "<group>"; };
+               BEC373A320CF3B5C00DBDF5B /* TPPBDisposition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDisposition.m; sourceTree = "<group>"; };
+               BEC373A620D810D800DBDF5B /* TPPBPolicyProhibits.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBPolicyProhibits.proto; sourceTree = "<group>"; };
+               BEC373A720D810D900DBDF5B /* TPPBUnknownMachineID.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBUnknownMachineID.proto; sourceTree = "<group>"; };
+               BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBAncientEpoch.proto; sourceTree = "<group>"; };
+               BEC373AC20D815E000DBDF5B /* TPPBUnknownMachineID.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBUnknownMachineID.m; sourceTree = "<group>"; };
+               BEC373AD20D815E100DBDF5B /* TPPBAncientEpoch.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBAncientEpoch.m; sourceTree = "<group>"; };
+               BEC373AE20D815E200DBDF5B /* TPPBPolicyProhibits.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBPolicyProhibits.m; sourceTree = "<group>"; };
+               BEC373AF20D815E200DBDF5B /* TPPBAncientEpoch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBAncientEpoch.h; sourceTree = "<group>"; };
+               BEC373B020D815E300DBDF5B /* TPPBPolicyProhibits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBPolicyProhibits.h; sourceTree = "<group>"; };
+               BEC373B120D815E400DBDF5B /* TPPBUnknownMachineID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBUnknownMachineID.h; sourceTree = "<group>"; };
+               BEC373C120D8224A00DBDF5B /* TPPBDispositionEntry.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = TPPBDispositionEntry.proto; sourceTree = "<group>"; };
+               BEC373C920D822CD00DBDF5B /* TPPBDispositionEntry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPPBDispositionEntry.m; sourceTree = "<group>"; };
+               BEC373CA20D822CE00DBDF5B /* TPPBDispositionEntry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPPBDispositionEntry.h; sourceTree = "<group>"; };
+               BEC6A9142331992800080069 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; };
+               BECEC0FD20A3B94C00E97255 /* TrustedPeersHelperUnitTests-BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TrustedPeersHelperUnitTests-BridgingHeader.h"; sourceTree = "<group>"; };
+               BECEC11020A508F600E97255 /* TPVoucher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPVoucher.h; sourceTree = "<group>"; };
+               BECEC11120A508F600E97255 /* TPVoucher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPVoucher.m; sourceTree = "<group>"; };
+               BECFA42E20F91AFE00B11002 /* tppolicy */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tppolicy; sourceTree = BUILT_PRODUCTS_DIR; };
+               BECFA43020F91AFE00B11002 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               BECFA43C20F9493000B11002 /* Policy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Policy.swift; sourceTree = "<group>"; };
+               BECFA46320FFB87400B11002 /* TPKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPKey.m; sourceTree = "<group>"; };
+               BED01530206F050F0027A2B4 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.txt; path = trust/README.txt; sourceTree = "<group>"; };
+               BED0781D2542A2B300FED203 /* CARevocationTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CARevocationTests_data.h; path = tests/TrustTests/EvaluationTests/CARevocationTests_data.h; sourceTree = "<group>"; };
+               BED078F82542A2BF00FED203 /* CARevocationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CARevocationTests.m; path = tests/TrustTests/EvaluationTests/CARevocationTests.m; 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>"; };
                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>"; };
+               BED987D32099145300607A5F /* TrustedPeersHelperUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrustedPeersHelperUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               BED987D52099145300607A5F /* TrustedPeersHelperUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrustedPeersHelperUnitTests.swift; sourceTree = "<group>"; };
+               BED987D72099145300607A5F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               BED987E220991C4D00607A5F /* MockCuttlefish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCuttlefish.swift; 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; };
                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; };


@@ -10309,8 +12583,6 @@
                BEF88C471EB0005E00357577 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = keychain/trust/TrustedPeers/Info.plist; sourceTree = SOURCE_ROOT; };
                BEF88C481EB0005E00357577 /* TPCategoryRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPCategoryRule.h; path = keychain/trust/TrustedPeers/TPCategoryRule.h; sourceTree = SOURCE_ROOT; };
                BEF88C491EB0005E00357577 /* TPCategoryRule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPCategoryRule.m; path = keychain/trust/TrustedPeers/TPCategoryRule.m; sourceTree = SOURCE_ROOT; };
                BEF88C471EB0005E00357577 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = keychain/trust/TrustedPeers/Info.plist; sourceTree = SOURCE_ROOT; };
                BEF88C481EB0005E00357577 /* TPCategoryRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPCategoryRule.h; path = keychain/trust/TrustedPeers/TPCategoryRule.h; sourceTree = SOURCE_ROOT; };
                BEF88C491EB0005E00357577 /* TPCategoryRule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPCategoryRule.m; path = keychain/trust/TrustedPeers/TPCategoryRule.m; sourceTree = SOURCE_ROOT; };

-               BEF88C4A1EB0005E00357577 /* TPCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPCircle.h; path = keychain/trust/TrustedPeers/TPCircle.h; sourceTree = SOURCE_ROOT; };
-               BEF88C4B1EB0005E00357577 /* TPCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPCircle.m; path = keychain/trust/TrustedPeers/TPCircle.m; sourceTree = SOURCE_ROOT; };

                BEF88C4C1EB0005E00357577 /* TPDecrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDecrypter.h; path = keychain/trust/TrustedPeers/TPDecrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C4D1EB0005E00357577 /* TPEncrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPEncrypter.h; path = keychain/trust/TrustedPeers/TPEncrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C4E1EB0005E00357577 /* TPHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPHash.h; path = keychain/trust/TrustedPeers/TPHash.h; sourceTree = SOURCE_ROOT; };
                BEF88C4C1EB0005E00357577 /* TPDecrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDecrypter.h; path = keychain/trust/TrustedPeers/TPDecrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C4D1EB0005E00357577 /* TPEncrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPEncrypter.h; path = keychain/trust/TrustedPeers/TPEncrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C4E1EB0005E00357577 /* TPHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPHash.h; path = keychain/trust/TrustedPeers/TPHash.h; sourceTree = SOURCE_ROOT; };


@@ -10329,15 +12601,10 @@
                BEF88C5B1EB0005E00357577 /* TPPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicy.m; path = keychain/trust/TrustedPeers/TPPolicy.m; sourceTree = SOURCE_ROOT; };
                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPPolicyDocument.h; path = keychain/trust/TrustedPeers/TPPolicyDocument.h; sourceTree = SOURCE_ROOT; };
                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicyDocument.m; path = keychain/trust/TrustedPeers/TPPolicyDocument.m; sourceTree = SOURCE_ROOT; };
                BEF88C5B1EB0005E00357577 /* TPPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicy.m; path = keychain/trust/TrustedPeers/TPPolicy.m; sourceTree = SOURCE_ROOT; };
                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPPolicyDocument.h; path = keychain/trust/TrustedPeers/TPPolicyDocument.h; sourceTree = SOURCE_ROOT; };
                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicyDocument.m; path = keychain/trust/TrustedPeers/TPPolicyDocument.m; sourceTree = SOURCE_ROOT; };

-               BEF88C5E1EB0005E00357577 /* TPSigningKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPSigningKey.h; path = keychain/trust/TrustedPeers/TPSigningKey.h; sourceTree = SOURCE_ROOT; };
+               BEF88C5E1EB0005E00357577 /* TPKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPKey.h; path = keychain/trust/TrustedPeers/TPKey.h; sourceTree = SOURCE_ROOT; };

                BEF88C5F1EB0005E00357577 /* TPTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPTypes.h; path = keychain/trust/TrustedPeers/TPTypes.h; sourceTree = SOURCE_ROOT; };
                BEF88C5F1EB0005E00357577 /* TPTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPTypes.h; path = keychain/trust/TrustedPeers/TPTypes.h; sourceTree = SOURCE_ROOT; };

-               BEF88C601EB0005E00357577 /* TPUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPUtils.h; path = keychain/trust/TrustedPeers/TPUtils.h; sourceTree = SOURCE_ROOT; };
-               BEF88C611EB0005E00357577 /* TPUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPUtils.m; path = keychain/trust/TrustedPeers/TPUtils.m; sourceTree = SOURCE_ROOT; };
-               BEF88C621EB0005E00357577 /* TPVoucher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPVoucher.h; path = keychain/trust/TrustedPeers/TPVoucher.h; sourceTree = SOURCE_ROOT; };
-               BEF88C631EB0005F00357577 /* TPVoucher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPVoucher.m; path = keychain/trust/TrustedPeers/TPVoucher.m; sourceTree = SOURCE_ROOT; };

                BEF88C641EB0005F00357577 /* TrustedPeers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrustedPeers.h; path = keychain/trust/TrustedPeers/TrustedPeers.h; sourceTree = SOURCE_ROOT; };
                BEF88C661EB0008E00357577 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = keychain/trust/TrustedPeersTests/Info.plist; sourceTree = SOURCE_ROOT; };
                BEF88C641EB0005F00357577 /* TrustedPeers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrustedPeers.h; path = keychain/trust/TrustedPeers/TrustedPeers.h; sourceTree = SOURCE_ROOT; };
                BEF88C661EB0008E00357577 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = keychain/trust/TrustedPeersTests/Info.plist; sourceTree = SOURCE_ROOT; };

-               BEF88C671EB0008E00357577 /* TPCircleTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPCircleTests.m; path = keychain/trust/TrustedPeersTests/TPCircleTests.m; sourceTree = SOURCE_ROOT; };

                BEF88C681EB0008E00357577 /* TPDummyDecrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDummyDecrypter.h; path = keychain/trust/TrustedPeersTests/TPDummyDecrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPDummyDecrypter.m; path = keychain/trust/TrustedPeersTests/TPDummyDecrypter.m; sourceTree = SOURCE_ROOT; };
                BEF88C6A1EB0008E00357577 /* TPDummyEncrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDummyEncrypter.h; path = keychain/trust/TrustedPeersTests/TPDummyEncrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C681EB0008E00357577 /* TPDummyDecrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDummyDecrypter.h; path = keychain/trust/TrustedPeersTests/TPDummyDecrypter.h; sourceTree = SOURCE_ROOT; };
                BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPDummyDecrypter.m; path = keychain/trust/TrustedPeersTests/TPDummyDecrypter.m; sourceTree = SOURCE_ROOT; };
                BEF88C6A1EB0008E00357577 /* TPDummyEncrypter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TPDummyEncrypter.h; path = keychain/trust/TrustedPeersTests/TPDummyEncrypter.h; sourceTree = SOURCE_ROOT; };


@@ -10351,8 +12618,6 @@
                BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPeerStableInfoTests.m; path = keychain/trust/TrustedPeersTests/TPPeerStableInfoTests.m; sourceTree = SOURCE_ROOT; };
                BEF88C731EB0008E00357577 /* TPPeerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPeerTests.m; path = keychain/trust/TrustedPeersTests/TPPeerTests.m; sourceTree = SOURCE_ROOT; };
                BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicyDocumentTests.m; path = keychain/trust/TrustedPeersTests/TPPolicyDocumentTests.m; sourceTree = SOURCE_ROOT; };
                BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPeerStableInfoTests.m; path = keychain/trust/TrustedPeersTests/TPPeerStableInfoTests.m; sourceTree = SOURCE_ROOT; };
                BEF88C731EB0008E00357577 /* TPPeerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPeerTests.m; path = keychain/trust/TrustedPeersTests/TPPeerTests.m; sourceTree = SOURCE_ROOT; };
                BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPPolicyDocumentTests.m; path = keychain/trust/TrustedPeersTests/TPPolicyDocumentTests.m; sourceTree = SOURCE_ROOT; };

-               BEF88C751EB0008E00357577 /* TPUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPUtilsTests.m; path = keychain/trust/TrustedPeersTests/TPUtilsTests.m; sourceTree = SOURCE_ROOT; };
-               BEF88C761EB0008E00357577 /* TPVoucherTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TPVoucherTests.m; path = keychain/trust/TrustedPeersTests/TPVoucherTests.m; sourceTree = SOURCE_ROOT; };

                CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
                CD31F8601DCD4C1400414B46 /* SOSAccountTrust.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SOSAccountTrust.m; path = SecureObjectSync/SOSAccountTrust.m; sourceTree = "<group>"; };
                CD31F8611DCD4C1400414B46 /* SOSAccountTrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SOSAccountTrust.h; path = SecureObjectSync/SOSAccountTrust.h; sourceTree = "<group>"; };
                CD2F99D91DFC995B00769430 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
                CD31F8601DCD4C1400414B46 /* SOSAccountTrust.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SOSAccountTrust.m; path = SecureObjectSync/SOSAccountTrust.m; sourceTree = "<group>"; };
                CD31F8611DCD4C1400414B46 /* SOSAccountTrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SOSAccountTrust.h; path = SecureObjectSync/SOSAccountTrust.h; sourceTree = "<group>"; };


@@ -10361,131 +12626,365 @@
                CDA43D251DFCA0790038E038 /* AggregateDictionary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AggregateDictionary.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/PrivateFrameworks/AggregateDictionary.framework; sourceTree = DEVELOPER_DIR; };
                CDB9FCA9179CC757000AAD66 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPasswordGenerate.h; sourceTree = "<group>"; };
                CDA43D251DFCA0790038E038 /* AggregateDictionary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AggregateDictionary.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/System/Library/PrivateFrameworks/AggregateDictionary.framework; sourceTree = DEVELOPER_DIR; };
                CDB9FCA9179CC757000AAD66 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                CDDE9BC31729AB910013B0E8 /* SecPasswordGenerate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPasswordGenerate.h; sourceTree = "<group>"; };

+               D4056A1922712A650026E24E /* SSLPolicyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SSLPolicyTests.m; path = tests/TrustTests/EvaluationTests/SSLPolicyTests.m; sourceTree = "<group>"; };
+               D4056A1C22712AD80026E24E /* SSLPolicyTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SSLPolicyTests_data.h; path = tests/TrustTests/EvaluationTests/SSLPolicyTests_data.h; sourceTree = "<group>"; };
+               D4056A1D22712D740026E24E /* ssl-policy-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ssl-policy-certs"; path = "SecurityTests/ssl-policy-certs"; sourceTree = "<group>"; };
+               D4056A1E22712D750026E24E /* si-87-sectrust-name-constraints */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-87-sectrust-name-constraints"; path = "SecurityTests/si-87-sectrust-name-constraints"; sourceTree = "<group>"; };

                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; };
                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>"; };
-               D41257EB1E941CF200781F23 /* com.apple.trustd.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.trustd.sb; path = OSX/trustd/macOS/com.apple.trustd.sb; sourceTree = "<group>"; };
-               D41257EC1E941CF200781F23 /* trustd.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = trustd.8; path = OSX/trustd/macOS/trustd.8; sourceTree = "<group>"; };
-               D41257ED1E941D5B00781F23 /* SecTrustOSXEntryPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustOSXEntryPoints.h; path = OSX/trustd/macOS/SecTrustOSXEntryPoints.h; sourceTree = SOURCE_ROOT; };
-               D41257EE1E941DA800781F23 /* com.apple.trustd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = com.apple.trustd.plist; path = OSX/trustd/iOS/com.apple.trustd.plist; sourceTree = "<group>"; };
+               D41257E91E941CF200781F23 /* com.apple.trustd.agent.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.trustd.agent.plist; sourceTree = "<group>"; };
+               D41257EA1E941CF200781F23 /* com.apple.trustd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.trustd.plist; sourceTree = "<group>"; };
+               D41257EB1E941CF200781F23 /* com.apple.trustd.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.trustd.sb; sourceTree = "<group>"; };
+               D41257EC1E941CF200781F23 /* trustd.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = trustd.8; sourceTree = "<group>"; };
+               D41257ED1E941D5B00781F23 /* SecTrustOSXEntryPoints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrustOSXEntryPoints.h; path = trust/trustd/macOS/SecTrustOSXEntryPoints.h; sourceTree = SOURCE_ROOT; };
+               D41257EE1E941DA800781F23 /* com.apple.trustd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.trustd.plist; sourceTree = "<group>"; };

                D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libDiagnosticMessagesClient.tbd; path = usr/lib/libDiagnosticMessagesClient.tbd; sourceTree = SDKROOT; };
                D41D36701EB14D87007FA978 /* libDiagnosticMessagesClient.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libDiagnosticMessagesClient.tbd; path = usr/lib/libDiagnosticMessagesClient.tbd; sourceTree = SDKROOT; };

-               D43761641EB2996C00954447 /* SecRevocationNetworking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecRevocationNetworking.h; path = OSX/sec/securityd/SecRevocationNetworking.h; sourceTree = "<group>"; };
-               D43761651EB2996C00954447 /* SecRevocationNetworking.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecRevocationNetworking.m; path = OSX/sec/securityd/SecRevocationNetworking.m; 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.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>"; };
-               D43DBEDD1E99D17100C04AEA /* policytree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = policytree.c; path = OSX/sec/securityd/policytree.c; sourceTree = "<group>"; };
-               D43DBEDE1E99D17200C04AEA /* policytree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = policytree.h; path = OSX/sec/securityd/policytree.h; sourceTree = "<group>"; };
-               D43DBEDF1E99D17200C04AEA /* SecCAIssuerCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCAIssuerCache.c; path = OSX/sec/securityd/SecCAIssuerCache.c; sourceTree = "<group>"; };
-               D43DBEE01E99D17200C04AEA /* SecCAIssuerCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCAIssuerCache.h; path = OSX/sec/securityd/SecCAIssuerCache.h; sourceTree = "<group>"; };
-               D43DBEE11E99D17200C04AEA /* SecCAIssuerRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecCAIssuerRequest.m; path = OSX/sec/securityd/SecCAIssuerRequest.m; sourceTree = "<group>"; };
-               D43DBEE21E99D17200C04AEA /* SecCAIssuerRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCAIssuerRequest.h; path = OSX/sec/securityd/SecCAIssuerRequest.h; sourceTree = "<group>"; };
-               D43DBEE31E99D17200C04AEA /* SecCertificateServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCertificateServer.c; path = OSX/sec/securityd/SecCertificateServer.c; sourceTree = "<group>"; };
-               D43DBEE41E99D17200C04AEA /* SecCertificateServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateServer.h; path = OSX/sec/securityd/SecCertificateServer.h; sourceTree = "<group>"; };
-               D43DBEE51E99D17200C04AEA /* SecCertificateSource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCertificateSource.c; path = OSX/sec/securityd/SecCertificateSource.c; sourceTree = "<group>"; };
-               D43DBEE61E99D17200C04AEA /* SecCertificateSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateSource.h; path = OSX/sec/securityd/SecCertificateSource.h; sourceTree = "<group>"; };
-               D43DBEE71E99D17200C04AEA /* SecOCSPCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecOCSPCache.c; path = OSX/sec/securityd/SecOCSPCache.c; sourceTree = "<group>"; };
-               D43DBEE81E99D17200C04AEA /* SecOCSPCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecOCSPCache.h; path = OSX/sec/securityd/SecOCSPCache.h; sourceTree = "<group>"; };
-               D43DBEE91E99D17200C04AEA /* SecOCSPRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecOCSPRequest.c; path = OSX/sec/securityd/SecOCSPRequest.c; sourceTree = "<group>"; };
-               D43DBEEA1E99D17200C04AEA /* SecOCSPRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecOCSPRequest.h; path = OSX/sec/securityd/SecOCSPRequest.h; sourceTree = "<group>"; };
-               D43DBEEB1E99D17200C04AEA /* SecOCSPResponse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecOCSPResponse.c; path = OSX/sec/securityd/SecOCSPResponse.c; sourceTree = "<group>"; };
-               D43DBEEC1E99D17200C04AEA /* SecOCSPResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecOCSPResponse.h; path = OSX/sec/securityd/SecOCSPResponse.h; sourceTree = "<group>"; };
-               D43DBEED1E99D17200C04AEA /* SecPinningDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPinningDb.h; path = OSX/sec/securityd/SecPinningDb.h; sourceTree = "<group>"; };
-               D43DBEEE1E99D17200C04AEA /* SecPinningDb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecPinningDb.m; path = OSX/sec/securityd/SecPinningDb.m; sourceTree = "<group>"; };
-               D43DBEEF1E99D17300C04AEA /* SecPolicyServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecPolicyServer.c; path = OSX/sec/securityd/SecPolicyServer.c; sourceTree = "<group>"; };
-               D43DBEF01E99D17300C04AEA /* SecPolicyServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecPolicyServer.h; path = OSX/sec/securityd/SecPolicyServer.h; sourceTree = "<group>"; };
-               D43DBEF11E99D17300C04AEA /* SecRevocationDb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecRevocationDb.c; path = OSX/sec/securityd/SecRevocationDb.c; 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.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>"; };
+               D423114223725F9F000E470A /* SMIMEPolicyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SMIMEPolicyTests.m; path = tests/TrustTests/EvaluationTests/SMIMEPolicyTests.m; sourceTree = "<group>"; };
+               D4231147237261F7000E470A /* SMIMEPolicyTests-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "SMIMEPolicyTests-data"; path = "tests/TrustTests/TestData/SMIMEPolicyTests-data"; sourceTree = "<group>"; };
+               D42C838721158B3F008D3D83 /* cmsreclist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmsreclist.h; path = libsecurity_smime/lib/cmsreclist.h; sourceTree = SOURCE_ROOT; };
+               D42C838821158B40008D3D83 /* SecAsn1Item.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecAsn1Item.c; path = libsecurity_smime/lib/SecAsn1Item.c; sourceTree = SOURCE_ROOT; };
+               D42C8390211590BC008D3D83 /* CMSDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CMSDecoder.cpp; path = OSX/libsecurity_cms/lib/CMSDecoder.cpp; sourceTree = "<group>"; };
+               D42C8391211590D6008D3D83 /* CMSUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSUtils.h; path = OSX/libsecurity_cms/lib/CMSUtils.h; sourceTree = "<group>"; };
+               D42C8392211590D7008D3D83 /* CMSUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CMSUtils.cpp; path = OSX/libsecurity_cms/lib/CMSUtils.cpp; sourceTree = "<group>"; };
+               D42C8393211590D7008D3D83 /* CMSEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CMSEncoder.cpp; path = OSX/libsecurity_cms/lib/CMSEncoder.cpp; sourceTree = "<group>"; };
+               D42C839821159146008D3D83 /* libsecurity_cms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_cms.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               D42C83A121159568008D3D83 /* cms_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cms_regressions.h; path = OSX/libsecurity_cms/regressions/cms_regressions.h; sourceTree = "<group>"; };
+               D42C83A221159569008D3D83 /* cms-trust-settings-test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "cms-trust-settings-test.c"; path = "OSX/libsecurity_cms/regressions/cms-trust-settings-test.c"; sourceTree = "<group>"; };
+               D42C83A321159569008D3D83 /* cms-trust-settings-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cms-trust-settings-test.h"; path = "OSX/libsecurity_cms/regressions/cms-trust-settings-test.h"; sourceTree = "<group>"; };
+               D42C83A621163866008D3D83 /* cert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cert.h; path = libsecurity_smime/lib/cert.h; sourceTree = SOURCE_ROOT; };
+               D42D044124733BEA004E7AA2 /* com.apple.securityuploadd.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.securityuploadd.sb; sourceTree = "<group>"; };
+               D437185C211671A300EA350A /* cms-01-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "cms-01-basic.c"; path = "OSX/libsecurity_smime/regressions/cms-01-basic.c"; sourceTree = "<group>"; };
+               D437185D211671A400EA350A /* smime-cms-test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "smime-cms-test.c"; path = "OSX/libsecurity_smime/regressions/smime-cms-test.c"; sourceTree = "<group>"; };
+               D437185E211671A400EA350A /* cms-01-basic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cms-01-basic.h"; path = "OSX/libsecurity_smime/regressions/cms-01-basic.h"; sourceTree = "<group>"; };
+               D4371862211682D500EA350A /* cmscipher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmscipher.c; path = OSX/libsecurity_smime/lib/cmscipher.c; sourceTree = "<group>"; };
+               D4371863211682D500EA350A /* cmsarray.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsarray.c; path = OSX/libsecurity_smime/lib/cmsarray.c; sourceTree = "<group>"; };
+               D4371864211682D600EA350A /* cmsattr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsattr.c; path = OSX/libsecurity_smime/lib/cmsattr.c; sourceTree = "<group>"; };
+               D4371865211682D600EA350A /* cmsasn1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsasn1.c; path = OSX/libsecurity_smime/lib/cmsasn1.c; sourceTree = "<group>"; };
+               D4371866211682D600EA350A /* cmscinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmscinfo.c; path = OSX/libsecurity_smime/lib/cmscinfo.c; sourceTree = "<group>"; };
+               D4371867211682D700EA350A /* cert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cert.c; path = OSX/libsecurity_smime/lib/cert.c; sourceTree = "<group>"; };
+               D4371868211682D700EA350A /* cert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cert.h; path = OSX/libsecurity_smime/lib/cert.h; sourceTree = "<group>"; };
+               D43718702116831600EA350A /* cmsdigest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsdigest.c; path = OSX/libsecurity_smime/lib/cmsdigest.c; sourceTree = "<group>"; };
+               D43718712116831600EA350A /* cmsenvdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsenvdata.c; path = OSX/libsecurity_smime/lib/cmsenvdata.c; sourceTree = "<group>"; };
+               D43718722116831700EA350A /* cmsdecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsdecode.c; path = OSX/libsecurity_smime/lib/cmsdecode.c; sourceTree = "<group>"; };
+               D43718732116831700EA350A /* cmsmessage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsmessage.c; path = OSX/libsecurity_smime/lib/cmsmessage.c; sourceTree = "<group>"; };
+               D43718742116831800EA350A /* cmsencode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsencode.c; path = OSX/libsecurity_smime/lib/cmsencode.c; sourceTree = "<group>"; };
+               D43718752116831900EA350A /* cmsencdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsencdata.c; path = OSX/libsecurity_smime/lib/cmsencdata.c; sourceTree = "<group>"; };
+               D43718762116831900EA350A /* cmslocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmslocal.h; path = OSX/libsecurity_smime/lib/cmslocal.h; sourceTree = "<group>"; };
+               D43718772116831A00EA350A /* cmsdigdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsdigdata.c; path = OSX/libsecurity_smime/lib/cmsdigdata.c; sourceTree = "<group>"; };
+               D43718802116834000EA350A /* cmsreclist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsreclist.c; path = OSX/libsecurity_smime/lib/cmsreclist.c; sourceTree = "<group>"; };
+               D43718812116834000EA350A /* cmsreclist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmsreclist.h; path = OSX/libsecurity_smime/lib/cmsreclist.h; sourceTree = "<group>"; };
+               D43718822116834100EA350A /* cmspriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmspriv.h; path = OSX/libsecurity_smime/lib/cmspriv.h; sourceTree = "<group>"; };
+               D43718832116834100EA350A /* cmssiginfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmssiginfo.c; path = OSX/libsecurity_smime/lib/cmssiginfo.c; sourceTree = "<group>"; };
+               D43718842116834200EA350A /* cmssigdata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmssigdata.c; path = OSX/libsecurity_smime/lib/cmssigdata.c; sourceTree = "<group>"; };
+               D43718852116834300EA350A /* cmstpriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmstpriv.h; path = OSX/libsecurity_smime/lib/cmstpriv.h; sourceTree = "<group>"; };
+               D43718862116834300EA350A /* cmsrecinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsrecinfo.c; path = OSX/libsecurity_smime/lib/cmsrecinfo.c; sourceTree = "<group>"; };
+               D43718872116834400EA350A /* cmspubkey.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmspubkey.c; path = OSX/libsecurity_smime/lib/cmspubkey.c; sourceTree = "<group>"; };
+               D43718902116835E00EA350A /* secalgid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = secalgid.c; path = OSX/libsecurity_smime/lib/secalgid.c; sourceTree = "<group>"; };
+               D43718912116835E00EA350A /* cryptohi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cryptohi.h; path = OSX/libsecurity_smime/lib/cryptohi.h; sourceTree = "<group>"; };
+               D43718922116835F00EA350A /* secitem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = secitem.c; path = OSX/libsecurity_smime/lib/secitem.c; sourceTree = "<group>"; };
+               D43718932116836000EA350A /* cryptohi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cryptohi.c; path = OSX/libsecurity_smime/lib/cryptohi.c; sourceTree = "<group>"; };
+               D43718942116836000EA350A /* plhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = plhash.h; path = OSX/libsecurity_smime/lib/plhash.h; sourceTree = "<group>"; };
+               D43718952116836100EA350A /* plhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = plhash.c; path = OSX/libsecurity_smime/lib/plhash.c; sourceTree = "<group>"; };
+               D43718962116836200EA350A /* SecCMS.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCMS.c; path = OSX/libsecurity_smime/lib/SecCMS.c; sourceTree = "<group>"; };
+               D43718972116836200EA350A /* secitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secitem.h; path = OSX/libsecurity_smime/lib/secitem.h; sourceTree = "<group>"; };
+               D43718982116836300EA350A /* cmsutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmsutil.c; path = OSX/libsecurity_smime/lib/cmsutil.c; sourceTree = "<group>"; };
+               D43718A22116838F00EA350A /* siginfoUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = siginfoUtils.cpp; path = OSX/libsecurity_smime/lib/siginfoUtils.cpp; sourceTree = "<group>"; };
+               D43718A32116839000EA350A /* secoidt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secoidt.h; path = OSX/libsecurity_smime/lib/secoidt.h; sourceTree = "<group>"; };
+               D43718A42116839000EA350A /* secoid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = secoid.c; path = OSX/libsecurity_smime/lib/secoid.c; sourceTree = "<group>"; };
+               D43718A52116839100EA350A /* secoid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secoid.h; path = OSX/libsecurity_smime/lib/secoid.h; sourceTree = "<group>"; };
+               D43718A62116839200EA350A /* SecSMIMEPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecSMIMEPriv.h; path = OSX/libsecurity_smime/lib/SecSMIMEPriv.h; sourceTree = "<group>"; };
+               D43718A72116839200EA350A /* smimeutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = smimeutil.c; path = OSX/libsecurity_smime/lib/smimeutil.c; sourceTree = "<group>"; };
+               D43718AE211683A900EA350A /* tsaSupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tsaSupport.c; path = OSX/libsecurity_smime/lib/tsaSupport.c; sourceTree = "<group>"; };
+               D43718AF211683AA00EA350A /* tsaTemplates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tsaTemplates.c; path = OSX/libsecurity_smime/lib/tsaTemplates.c; sourceTree = "<group>"; };
+               D43718B2211683D100EA350A /* tsaSupportPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tsaSupportPriv.h; path = OSX/libsecurity_smime/lib/tsaSupportPriv.h; sourceTree = "<group>"; };
+               D43718B3211683D200EA350A /* tsaSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tsaSupport.h; path = OSX/libsecurity_smime/lib/tsaSupport.h; sourceTree = "<group>"; };
+               D43718B5211683D300EA350A /* tsaTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tsaTemplates.h; path = OSX/libsecurity_smime/lib/tsaTemplates.h; sourceTree = "<group>"; };
+               D43718BE21168BCC00EA350A /* libsecurity_cms.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = libsecurity_cms.txt; path = OSX/libsecurity_smime/docs/libsecurity_cms.txt; sourceTree = "<group>"; };
+               D43718BF21168BCD00EA350A /* libsecurity_cms.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = libsecurity_cms.plist; path = OSX/libsecurity_smime/docs/libsecurity_cms.plist; sourceTree = "<group>"; };
+               D43718C721168D7C00EA350A /* SecSMIME.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecSMIME.h; path = CMS/SecSMIME.h; sourceTree = "<group>"; };
+               D43761641EB2996C00954447 /* SecRevocationNetworking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecRevocationNetworking.h; sourceTree = "<group>"; };
+               D43761651EB2996C00954447 /* SecRevocationNetworking.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecRevocationNetworking.m; sourceTree = "<group>"; };
+               D43DBED71E99D17100C04AEA /* nameconstraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nameconstraints.c; sourceTree = "<group>"; };
+               D43DBED81E99D17100C04AEA /* nameconstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nameconstraints.h; sourceTree = "<group>"; };
+               D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTATrustUtilities.m; sourceTree = "<group>"; };
+               D43DBEDA1E99D17100C04AEA /* OTATrustUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTATrustUtilities.h; sourceTree = "<group>"; };
+               D43DBEDB1E99D17100C04AEA /* personalization.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = personalization.c; sourceTree = "<group>"; };
+               D43DBEDC1E99D17100C04AEA /* personalization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = personalization.h; sourceTree = "<group>"; };
+               D43DBEDD1E99D17100C04AEA /* policytree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = policytree.c; sourceTree = "<group>"; };
+               D43DBEDE1E99D17200C04AEA /* policytree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = policytree.h; sourceTree = "<group>"; };
+               D43DBEDF1E99D17200C04AEA /* SecCAIssuerCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCAIssuerCache.c; sourceTree = "<group>"; };
+               D43DBEE01E99D17200C04AEA /* SecCAIssuerCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCAIssuerCache.h; sourceTree = "<group>"; };
+               D43DBEE11E99D17200C04AEA /* SecCAIssuerRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecCAIssuerRequest.m; sourceTree = "<group>"; };
+               D43DBEE21E99D17200C04AEA /* SecCAIssuerRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCAIssuerRequest.h; sourceTree = "<group>"; };
+               D43DBEE31E99D17200C04AEA /* SecCertificateServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCertificateServer.c; sourceTree = "<group>"; };
+               D43DBEE41E99D17200C04AEA /* SecCertificateServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateServer.h; sourceTree = "<group>"; };
+               D43DBEE51E99D17200C04AEA /* SecCertificateSource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCertificateSource.c; sourceTree = "<group>"; };
+               D43DBEE61E99D17200C04AEA /* SecCertificateSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCertificateSource.h; sourceTree = "<group>"; };
+               D43DBEE71E99D17200C04AEA /* SecOCSPCache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOCSPCache.c; sourceTree = "<group>"; };
+               D43DBEE81E99D17200C04AEA /* SecOCSPCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOCSPCache.h; sourceTree = "<group>"; };
+               D43DBEE91E99D17200C04AEA /* SecOCSPRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOCSPRequest.c; sourceTree = "<group>"; };
+               D43DBEEA1E99D17200C04AEA /* SecOCSPRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOCSPRequest.h; sourceTree = "<group>"; };
+               D43DBEEB1E99D17200C04AEA /* SecOCSPResponse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOCSPResponse.c; sourceTree = "<group>"; };
+               D43DBEEC1E99D17200C04AEA /* SecOCSPResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOCSPResponse.h; sourceTree = "<group>"; };
+               D43DBEED1E99D17200C04AEA /* SecPinningDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPinningDb.h; sourceTree = "<group>"; };
+               D43DBEEE1E99D17200C04AEA /* SecPinningDb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecPinningDb.m; sourceTree = "<group>"; };
+               D43DBEEF1E99D17300C04AEA /* SecPolicyServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecPolicyServer.c; sourceTree = "<group>"; };
+               D43DBEF01E99D17300C04AEA /* SecPolicyServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPolicyServer.h; sourceTree = "<group>"; };
+               D43DBEF11E99D17300C04AEA /* SecRevocationDb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecRevocationDb.c; sourceTree = "<group>"; };
+               D43DBEF21E99D17300C04AEA /* SecRevocationDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecRevocationDb.h; sourceTree = "<group>"; };
+               D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecRevocationServer.c; sourceTree = "<group>"; };
+               D43DBEF41E99D17300C04AEA /* SecRevocationServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecRevocationServer.h; sourceTree = "<group>"; };
+               D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecTrustLoggingServer.m; sourceTree = "<group>"; };
+               D43DBEF61E99D17300C04AEA /* SecTrustLoggingServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrustLoggingServer.h; sourceTree = "<group>"; };
+               D43DBEF71E99D17300C04AEA /* SecTrustServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecTrustServer.c; sourceTree = "<group>"; };
+               D43DBEF81E99D17300C04AEA /* SecTrustServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrustServer.h; sourceTree = "<group>"; };
+               D43DBEF91E99D17300C04AEA /* SecTrustStoreServer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecTrustStoreServer.c; sourceTree = "<group>"; };
+               D43DBEFA1E99D17300C04AEA /* SecTrustStoreServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 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>"; };
                D43DDE511F620F09009742A5 /* SecPolicyChecks.list */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecPolicyChecks.list; sourceTree = "<group>"; };
                D43DDE581F638061009742A5 /* SecPolicy.list */ = {isa = PBXFileReference; lastKnownFileType = text; path = SecPolicy.list; sourceTree = "<group>"; };

-               D442AD62215ADA250050B50F /* AppleCorporateRootCA2.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = AppleCorporateRootCA2.cer; path = OSX/trustd/iOS/AppleCorporateRootCA2.cer; sourceTree = "<group>"; };
-               D442AD68215ADA250050B50F /* AppleCorporateRootCA.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = AppleCorporateRootCA.cer; path = OSX/trustd/iOS/AppleCorporateRootCA.cer; sourceTree = "<group>"; };
+               D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TrustEvaluationTestHelpers.m; path = tests/TrustTests/TrustEvaluationTestHelpers.m; sourceTree = "<group>"; };
+               D442AD62215ADA250050B50F /* AppleCorporateRootCA2.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = AppleCorporateRootCA2.cer; sourceTree = "<group>"; };
+               D442AD68215ADA250050B50F /* AppleCorporateRootCA.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = AppleCorporateRootCA.cer; sourceTree = "<group>"; };

                D44D08B420AB890E0023C439 /* Security.apinotes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Security.apinotes; path = base/Security.apinotes; sourceTree = "<group>"; };
                D44D08B420AB890E0023C439 /* Security.apinotes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Security.apinotes; path = base/Security.apinotes; 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>"; };
+               D44D1F662115893000E76E1A /* libCMS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCMS.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               D44D1F8321158AAB00E76E1A /* plhash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = plhash.h; path = libsecurity_smime/lib/plhash.h; sourceTree = SOURCE_ROOT; };
+               D44D1F8421158AAC00E76E1A /* crypto-embedded.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "crypto-embedded.c"; path = "libsecurity_smime/lib/crypto-embedded.c"; sourceTree = SOURCE_ROOT; };
+               D44D1F8521158AAC00E76E1A /* cmscinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmscinfo.c; path = libsecurity_smime/lib/cmscinfo.c; sourceTree = SOURCE_ROOT; };
+               D44D1F8621158AAD00E76E1A /* cmssiginfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmssiginfo.c; path = libsecurity_smime/lib/cmssiginfo.c; sourceTree = SOURCE_ROOT; };
+               D44D1F8721158AAD00E76E1A /* cryptohi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cryptohi.h; path = libsecurity_smime/lib/cryptohi.h; sourceTree = SOURCE_ROOT; };
+               D44D1F8821158AAE00E76E1A /* cmsdigest.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsdigest.c; path = libsecurity_smime/lib/cmsdigest.c; sourceTree = SOURCE_ROOT; };
+               D44D1F8921158AAE00E76E1A /* cmsreclist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsreclist.c; path = libsecurity_smime/lib/cmsreclist.c; sourceTree = SOURCE_ROOT; };
+               D44D1F8A21158AAF00E76E1A /* cmsencode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsencode.c; path = libsecurity_smime/lib/cmsencode.c; sourceTree = SOURCE_ROOT; };
+               D44D1F8B21158AAF00E76E1A /* secoidt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = secoidt.h; path = libsecurity_smime/lib/secoidt.h; sourceTree = SOURCE_ROOT; };
+               D45068681E948A9E00FA7675 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
+               D45068691E948ACE00FA7675 /* entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
+               D453A4C02122236D00850A26 /* TrustTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrustTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };

                D453C38A1FEC669300DE349B /* trust_update.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = trust_update.m; 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; };
+               D453C47F1FFD857400DE349B /* security_tool_commands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = security_tool_commands.h; sourceTree = "<group>"; };
+               D458C4AA214E198D0043D982 /* CTTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTTests.m; path = tests/TrustTests/EvaluationTests/CTTests.m; sourceTree = "<group>"; };
+               D458C4AD214E198E0043D982 /* iAPTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iAPTests_data.h; path = tests/TrustTests/EvaluationTests/iAPTests_data.h; sourceTree = "<group>"; };
+               D458C4AE214E198E0043D982 /* EvaluationBasicTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EvaluationBasicTests_data.h; path = tests/TrustTests/EvaluationTests/EvaluationBasicTests_data.h; sourceTree = "<group>"; };
+               D458C4AF214E198E0043D982 /* EvaluationBasicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EvaluationBasicTests.m; path = tests/TrustTests/EvaluationTests/EvaluationBasicTests.m; sourceTree = "<group>"; };
+               D458C4B4214E19AE0043D982 /* PathParseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PathParseTests.m; path = tests/TrustTests/EvaluationTests/PathParseTests.m; sourceTree = "<group>"; };
+               D458C4B5214E19AE0043D982 /* iAPTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iAPTests.m; path = tests/TrustTests/EvaluationTests/iAPTests.m; sourceTree = "<group>"; };
+               D458C4B6214E19AE0043D982 /* SignatureAlgorithmTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureAlgorithmTests_data.h; path = tests/TrustTests/EvaluationTests/SignatureAlgorithmTests_data.h; sourceTree = "<group>"; };
+               D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureAlgorithmTests.m; path = tests/TrustTests/EvaluationTests/SignatureAlgorithmTests.m; sourceTree = "<group>"; };
+               D458C4BE214E19FA0043D982 /* TrustSettingsInterfaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TrustSettingsInterfaceTests.m; path = tests/TrustTests/FrameworkTests/TrustSettingsInterfaceTests.m; sourceTree = "<group>"; };
+               D458C4BF214E19FB0043D982 /* TrustInterfaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TrustInterfaceTests.m; path = tests/TrustTests/FrameworkTests/TrustInterfaceTests.m; sourceTree = "<group>"; };
+               D458C4C0214E19FB0043D982 /* TrustInterfaceTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrustInterfaceTests_data.h; path = tests/TrustTests/FrameworkTests/TrustInterfaceTests_data.h; sourceTree = "<group>"; };
+               D458C4C5214E1A400043D982 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = tests/TrustTests/TestRunners/Assets.xcassets; sourceTree = "<group>"; };
+               D458C4C6214E1A400043D982 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = tests/TrustTests/TestRunners/main.m; sourceTree = "<group>"; };
+               D458C4C8214E1A410043D982 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = tests/TrustTests/TestRunners/AppDelegate.h; sourceTree = "<group>"; };
+               D458C4C9214E1A410043D982 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewController.h; path = tests/TrustTests/TestRunners/ViewController.h; sourceTree = "<group>"; };
+               D458C4CA214E1A420043D982 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = tests/TrustTests/TestRunners/AppDelegate.m; sourceTree = "<group>"; };
+               D458C4CB214E1A420043D982 /* trusttests_entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = trusttests_entitlements.plist; path = tests/TrustTests/TestRunners/trusttests_entitlements.plist; sourceTree = "<group>"; };
+               D458C4CC214E1A420043D982 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = tests/TrustTests/TestRunners/Info.plist; sourceTree = "<group>"; };
+               D458C4CD214E1A430043D982 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ViewController.m; path = tests/TrustTests/TestRunners/ViewController.m; sourceTree = "<group>"; };
+               D458C4E1214E1DE00043D982 /* TrustTestsRunner_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TrustTestsRunner_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
+               D458C4FC214E1E6C0043D982 /* appmain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = appmain.m; path = tests/TrustTests/TestRunners/appmain.m; sourceTree = "<group>"; };
+               D458C4FE214E1F8E0043D982 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = ../../../../iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+               D458C500214E1FAF0043D982 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+               D458C506214E20530043D982 /* TrustTests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TrustTests; sourceTree = BUILT_PRODUCTS_DIR; };
+               D458C511214E20840043D982 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+               D458C513214E27620043D982 /* PolicyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PolicyTests.m; path = tests/TrustTests/EvaluationTests/PolicyTests.m; sourceTree = "<group>"; };
+               D458C51B214E2CFF0043D982 /* si-20-sectrust-policies-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-20-sectrust-policies-data"; path = "OSX/shared_regressions/si-20-sectrust-policies-data"; sourceTree = "<group>"; };
+               D458C51E214E2E0C0043D982 /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Main.storyboard; path = tests/TrustTests/TestRunners/Main.storyboard; sourceTree = "<group>"; };
+               D458DAC22375FEA300E5890E /* TrustSettingsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TrustSettingsTests.m; path = tests/TrustTests/EvaluationTests/TrustSettingsTests.m; sourceTree = "<group>"; };
+               D458DAC52375FEE900E5890E /* TrustSettingsTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TrustSettingsTests_data.h; path = tests/TrustTests/EvaluationTests/TrustSettingsTests_data.h; sourceTree = "<group>"; };

                D46246911F9AE2E400D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
                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>"; };
+               D46246A21F9AE49E00D63882 /* oids.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = oids.h; path = trust/headers/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; };
                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; };

-               D46513072097954B005D93FE /* si-23-sectrust-ocsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-23-sectrust-ocsp.h"; sourceTree = "<group>"; };
-               D46A6BF121531F77008ABF6A /* si-82-sectrust-ct.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "si-82-sectrust-ct.h"; path = "OSX/shared_regressions/si-82-sectrust-ct.h"; sourceTree = SOURCE_ROOT; };
-               D46B379F2151B6E50083DAAA /* SecTrustStoreServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecTrustStoreServer.m; path = OSX/sec/securityd/SecTrustStoreServer.m; sourceTree = "<group>"; };
-               D479F6E01F980F8F00388D28 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Trust.strings; sourceTree = "<group>"; };
+               D47079F221128C46005BCFDA /* SecCMS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecCMS.h; path = CMS/SecCMS.h; sourceTree = "<group>"; };
+               D47079F9211355B3005BCFDA /* CMSEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSEncoder.h; path = CMS/CMSEncoder.h; sourceTree = "<group>"; };
+               D4707A0521136E69005BCFDA /* TrustTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TrustTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               D4707A0D211373D4005BCFDA /* CMSPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSPrivate.h; path = CMS/CMSPrivate.h; sourceTree = "<group>"; };
+               D4707A1021137525005BCFDA /* CMSDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CMSDecoder.h; path = CMS/CMSDecoder.h; sourceTree = "<group>"; };
+               D4707A1F2113AB65005BCFDA /* SecCmsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsBase.h; path = CMS/SecCmsBase.h; sourceTree = "<group>"; };
+               D4707A222113B48E005BCFDA /* SecCmsEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsEncoder.h; path = CMS/SecCmsEncoder.h; sourceTree = "<group>"; };
+               D4707A252113E9B6005BCFDA /* SecCmsDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsDecoder.h; path = CMS/SecCmsDecoder.h; sourceTree = "<group>"; };
+               D4707A282113ECA0005BCFDA /* SecCmsMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsMessage.h; path = CMS/SecCmsMessage.h; sourceTree = "<group>"; };
+               D4707A2B2114B31A005BCFDA /* SecCmsContentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsContentInfo.h; path = CMS/SecCmsContentInfo.h; sourceTree = "<group>"; };
+               D4707A2E2114C30A005BCFDA /* SecCmsDigestContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsDigestContext.h; path = CMS/SecCmsDigestContext.h; sourceTree = "<group>"; };
+               D477CB5B237B6E0E00C02355 /* PersonalizationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PersonalizationTests.m; path = tests/TrustTests/DaemonTests/PersonalizationTests.m; sourceTree = "<group>"; };
+               D477CB69237CBA2C00C02355 /* TrustDaemonTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TrustDaemonTestCase.m; path = tests/TrustTests/DaemonTests/TrustDaemonTestCase.m; sourceTree = "<group>"; };
+               D477CB6D237CBACD00C02355 /* TrustDaemonTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TrustDaemonTestCase.h; path = tests/TrustTests/DaemonTests/TrustDaemonTestCase.h; sourceTree = "<group>"; };
+               D477CB76237E453C00C02355 /* si-88-sectrust-valid-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-88-sectrust-valid-data"; path = "SecurityTests/si-88-sectrust-valid-data"; sourceTree = "<group>"; };
+               D477CB7A237E4BD700C02355 /* ExceptionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ExceptionTests.m; path = tests/TrustTests/EvaluationTests/ExceptionTests.m; sourceTree = "<group>"; };
+               D477CB7D237F321400C02355 /* ExceptionTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExceptionTests_data.h; path = tests/TrustTests/EvaluationTests/ExceptionTests_data.h; sourceTree = "<group>"; };
+               D477CB81237F692400C02355 /* RevocationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RevocationTests.m; path = tests/TrustTests/EvaluationTests/RevocationTests.m; sourceTree = "<group>"; };
+               D477CB85237F6A0700C02355 /* RevocationTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RevocationTests_data.h; path = tests/TrustTests/EvaluationTests/RevocationTests_data.h; sourceTree = "<group>"; };
+               D477CB86237F8B2F00C02355 /* CAIssuerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CAIssuerTests.m; path = tests/TrustTests/EvaluationTests/CAIssuerTests.m; sourceTree = "<group>"; };
+               D477CB89237F8CB300C02355 /* CAIssuerTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAIssuerTests_data.h; path = tests/TrustTests/EvaluationTests/CAIssuerTests_data.h; sourceTree = "<group>"; };
+               D477CB8A237F8DBB00C02355 /* AllowlistBlocklistTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AllowlistBlocklistTests.m; path = tests/TrustTests/EvaluationTests/AllowlistBlocklistTests.m; sourceTree = "<group>"; };
+               D477CB8D237F8EB200C02355 /* AllowlistBlocklistTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AllowlistBlocklistTests_data.h; path = tests/TrustTests/EvaluationTests/AllowlistBlocklistTests_data.h; sourceTree = "<group>"; };
+               D477CB8E237F975500C02355 /* ValidTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ValidTests.m; path = tests/TrustTests/EvaluationTests/ValidTests.m; sourceTree = "<group>"; };
+               D479F6E01F980F8F00388D28 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = en.lproj/Trust.strings; sourceTree = "<group>"; };
+               D47A085B2486EC1A000F2C49 /* AppleExternalRootCertificates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleExternalRootCertificates.h; sourceTree = "<group>"; };
+               D47A55892466100A0039285D /* MSUDataAccessor.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MSUDataAccessor.framework; path = System/Library/PrivateFrameworks/MSUDataAccessor.framework; sourceTree = SDKROOT; };
+               D47AB2CA2356AD72005A3801 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; };
+               D47C4579255244AD00460750 /* CertificateTransparency.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CertificateTransparency.m; sourceTree = "<group>"; };
+               D47C4730255246FC00460750 /* CertificateTransparency.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CertificateTransparency.h; 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>"; };
                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>"; };

                D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMobileGestalt.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/usr/lib/libMobileGestalt.dylib; sourceTree = DEVELOPER_DIR; };
                D47CA65C1EB036450038E2BB /* libMobileGestalt.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMobileGestalt.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.0.Internal.sdk/usr/lib/libMobileGestalt.dylib; sourceTree = DEVELOPER_DIR; };

+               D47DCCB423427C7D00B80E37 /* md.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = md.m; sourceTree = "<group>"; };
+               D47DCCB723427C8D00B80E37 /* md.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = md.h; sourceTree = "<group>"; };

                D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecCFAllocator.h; sourceTree = "<group>"; };
                D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecCFAllocator.h; sourceTree = "<group>"; };

-               D484A1012167D6F8008653A9 /* ct_exceptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ct_exceptions.m; sourceTree = "<group>"; };
-               D487FBB71DB8357300D4BB0B /* si-29-sectrust-sha1-deprecation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-29-sectrust-sha1-deprecation.m"; sourceTree = "<group>"; };
-               D487FBB91DB835B500D4BB0B /* si-29-sectrust-sha1-deprecation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-29-sectrust-sha1-deprecation.h"; sourceTree = "<group>"; };

                D48BD193206C47530075DDC9 /* si-35-cms-expiration-time.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-35-cms-expiration-time.m"; sourceTree = "<group>"; };
                D48BD195206C476B0075DDC9 /* si-35-cms-expiration-time.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-35-cms-expiration-time.h"; sourceTree = "<group>"; };
                D48F029B1EA1671B00ACC3C9 /* si-61-pkcs12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-61-pkcs12.h"; sourceTree = "<group>"; };
                D4911167209558900066A1E4 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
                D48BD193206C47530075DDC9 /* si-35-cms-expiration-time.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-35-cms-expiration-time.m"; sourceTree = "<group>"; };
                D48BD195206C476B0075DDC9 /* si-35-cms-expiration-time.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-35-cms-expiration-time.h"; sourceTree = "<group>"; };
                D48F029B1EA1671B00ACC3C9 /* si-61-pkcs12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-61-pkcs12.h"; sourceTree = "<group>"; };
                D4911167209558900066A1E4 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };

-               D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TrustURLSessionDelegate.m; path = OSX/sec/securityd/TrustURLSessionDelegate.m; sourceTree = "<group>"; };
-               D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TrustURLSessionDelegate.h; path = OSX/sec/securityd/TrustURLSessionDelegate.h; sourceTree = "<group>"; };
-               D4AA647C1E97144700D317ED /* si-18-certificate-parse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-18-certificate-parse.m"; sourceTree = "<group>"; };
+               D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TrustURLSessionDelegate.m; sourceTree = "<group>"; };
+               D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrustURLSessionDelegate.h; sourceTree = "<group>"; };
+               D49A370B23877ECC0065719F /* OCSPCacheTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OCSPCacheTests.m; path = tests/TrustTests/DaemonTests/OCSPCacheTests.m; sourceTree = "<group>"; };
+               D4A0F8BA211E69CB00443CA1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = tests/TrustTests/Info.plist; sourceTree = "<group>"; };
+               D4A0F8BB211E69CB00443CA1 /* TestMacroConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMacroConversions.h; path = tests/TrustTests/TestMacroConversions.h; sourceTree = "<group>"; };
+               D4A0F8C1211E6A2F00443CA1 /* 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>"; };
+               D4A0F8C3211E6A5600443CA1 /* CertificateInterfaceTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CertificateInterfaceTests_data.h; path = tests/TrustTests/FrameworkTests/CertificateInterfaceTests_data.h; sourceTree = "<group>"; };
+               D4A0F8C4211E6A5700443CA1 /* TrustFrameworkTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TrustFrameworkTestCase.m; path = tests/TrustTests/FrameworkTests/TrustFrameworkTestCase.m; sourceTree = "<group>"; };
+               D4A0F8C5211E6A5700443CA1 /* TrustFrameworkTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrustFrameworkTestCase.h; path = tests/TrustTests/FrameworkTests/TrustFrameworkTestCase.h; sourceTree = "<group>"; };
+               D4A0F8C6211E6A5700443CA1 /* CertificateInterfaceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CertificateInterfaceTests.m; path = tests/TrustTests/FrameworkTests/CertificateInterfaceTests.m; sourceTree = "<group>"; };
+               D4A0F8C9211E6A8200443CA1 /* TrustEvaluationTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TrustEvaluationTestCase.m; path = tests/TrustTests/EvaluationTests/TrustEvaluationTestCase.m; sourceTree = "<group>"; };
+               D4A0F8CB211E6A8200443CA1 /* TrustEvaluationTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TrustEvaluationTestCase.h; path = tests/TrustTests/EvaluationTests/TrustEvaluationTestCase.h; sourceTree = "<group>"; };
+               D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ct_exceptions.m; sourceTree = "<group>"; };
+               D4A7946D22D7DD6E00D1B2B7 /* TrustEvaluationTestHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TrustEvaluationTestHelpers.h; path = tests/TrustTests/TrustEvaluationTestHelpers.h; sourceTree = "<group>"; };
+               D4A7DD7320A26CF900F51F3F /* AuthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthKit.framework; path = System/Library/PrivateFrameworks/AuthKit.framework; sourceTree = SDKROOT; };
+               D4AA0D9922FB959600D77FA4 /* si-29-cms-chain-mode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-29-cms-chain-mode.m"; sourceTree = "<group>"; };
+               D4AA0D9C22FB962300D77FA4 /* si-29-cms-chain-mode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-29-cms-chain-mode.h"; sourceTree = "<group>"; };

                D4AA64831E97270300D317ED /* si-18-certificate-parse */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-18-certificate-parse"; path = "OSX/shared_regressions/si-18-certificate-parse"; sourceTree = SOURCE_ROOT; };
                D4AA64831E97270300D317ED /* si-18-certificate-parse */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-18-certificate-parse"; path = "OSX/shared_regressions/si-18-certificate-parse"; sourceTree = SOURCE_ROOT; };

-               D4ADA30E1E2B1E650031CEA3 /* trustd-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "trustd-Info.plist"; path = "OSX/trustd/trustd-Info.plist"; sourceTree = "<group>"; };
+               D4AC5764214E195200A32C01 /* VerifyDateTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = VerifyDateTests.m; path = tests/TrustTests/EvaluationTests/VerifyDateTests.m; sourceTree = "<group>"; };
+               D4AC5765214E195300A32C01 /* VerifyDateTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VerifyDateTests_data.h; path = tests/TrustTests/EvaluationTests/VerifyDateTests_data.h; sourceTree = "<group>"; };
+               D4AC5766214E195300A32C01 /* ECTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ECTests.m; path = tests/TrustTests/EvaluationTests/ECTests.m; sourceTree = "<group>"; };
+               D4AC5767214E195300A32C01 /* ECTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ECTests_data.h; path = tests/TrustTests/EvaluationTests/ECTests_data.h; sourceTree = "<group>"; };
+               D4AC5768214E195400A32C01 /* KeySizeTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KeySizeTests.m; path = tests/TrustTests/EvaluationTests/KeySizeTests.m; sourceTree = "<group>"; };
+               D4AC5769214E195400A32C01 /* KeySizeTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KeySizeTests_data.h; path = tests/TrustTests/EvaluationTests/KeySizeTests_data.h; sourceTree = "<group>"; };
+               D4AC8BE721320AD0006E9871 /* CertificateParseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CertificateParseTests.m; path = tests/TrustTests/FrameworkTests/CertificateParseTests.m; sourceTree = "<group>"; };
+               D4AC8BED2132127A006E9871 /* si-18-certificate-parse */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-18-certificate-parse"; path = "OSX/shared_regressions/si-18-certificate-parse"; sourceTree = "<group>"; };
+               D4ADA30E1E2B1E650031CEA3 /* trustd-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "trustd-Info.plist"; sourceTree = "<group>"; };

                D4ADA3191E2B41670031CEA3 /* libtrustd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtrustd.a; sourceTree = BUILT_PRODUCTS_DIR; };
                D4ADA3191E2B41670031CEA3 /* libtrustd.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtrustd.a; sourceTree = BUILT_PRODUCTS_DIR; };

+               D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "TestCopyProperties_ios-data"; path = "tests/TrustTests/TestData/TestCopyProperties_ios-data"; sourceTree = "<group>"; };
+               D4B3B1CB2115149C00A43409 /* SecCmsDigestedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsDigestedData.h; path = CMS/SecCmsDigestedData.h; sourceTree = "<group>"; };
+               D4B3B1CE2115167600A43409 /* SecCmsEncryptedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsEncryptedData.h; path = CMS/SecCmsEncryptedData.h; sourceTree = "<group>"; };
+               D4B3B1D1211517B000A43409 /* SecCmsEnvelopedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsEnvelopedData.h; path = CMS/SecCmsEnvelopedData.h; sourceTree = "<group>"; };
+               D4B3B1D42115193600A43409 /* SecCmsRecipientInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsRecipientInfo.h; path = CMS/SecCmsRecipientInfo.h; sourceTree = "<group>"; };
+               D4B3B1D721151B9900A43409 /* SecCmsSignedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsSignedData.h; path = CMS/SecCmsSignedData.h; sourceTree = "<group>"; };
+               D4B3B1DA2115293300A43409 /* SecCmsSignerInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCmsSignerInfo.h; path = CMS/SecCmsSignerInfo.h; sourceTree = "<group>"; };
+               D4B68C5C211A7D98009FED69 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
+               D4B68C64211A8186009FED69 /* trustd_spi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = trustd_spi.h; sourceTree = "<group>"; };
+               D4B68C65211A8186009FED69 /* trustd_spi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = trustd_spi.c; sourceTree = "<group>"; };

                D4B6D57B2069D8450099FBEF /* si-34-cms-timestamp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-34-cms-timestamp.m"; sourceTree = "<group>"; };
                D4B6D5822069D85B0099FBEF /* si-34-cms-timestamp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-34-cms-timestamp.h"; sourceTree = "<group>"; };
                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; };
                D4B6D57B2069D8450099FBEF /* si-34-cms-timestamp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-34-cms-timestamp.m"; sourceTree = "<group>"; };
                D4B6D5822069D85B0099FBEF /* si-34-cms-timestamp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-34-cms-timestamp.h"; sourceTree = "<group>"; };
                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>"; };
+               D4BA4FD22388687A000B9E64 /* OCSPCacheTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OCSPCacheTests_data.h; path = tests/TrustTests/DaemonTests/OCSPCacheTests_data.h; sourceTree = "<group>"; };
+               D4BEECE61E93093A00F76D1A /* trustd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 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; };
                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; };
+               D4C263C81F952E64001317EA /* SecDebugErrorMessages.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 10; name = SecDebugErrorMessages.strings; path = derived_src/SecDebugErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+               D4C263CD1F952F6C001317EA /* SecErrorMessages.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = SecErrorMessages.strings; path = derived_src/en.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>"; };
                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>"; };

+               D4CF6E63211588660014647E /* SecSMIME.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecSMIME.h; path = libsecurity_smime/lib/SecSMIME.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E64211588670014647E /* cmspriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cmspriv.h; path = libsecurity_smime/lib/cmspriv.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E65211588670014647E /* cmspubkey.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmspubkey.c; path = libsecurity_smime/lib/cmspubkey.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E66211588670014647E /* cmsattr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsattr.c; path = libsecurity_smime/lib/cmsattr.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E67211588680014647E /* cmstpriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cmstpriv.h; path = libsecurity_smime/lib/cmstpriv.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E68211588680014647E /* CMSDecoder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = CMSDecoder.c; path = libsecurity_smime/lib/CMSDecoder.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E69211588680014647E /* secalgid.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = secalgid.c; path = libsecurity_smime/lib/secalgid.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E6A211588690014647E /* secoid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = secoid.h; path = libsecurity_smime/lib/secoid.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E6B211588690014647E /* cmsarray.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsarray.c; path = libsecurity_smime/lib/cmsarray.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E6C211588690014647E /* cmsmessage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsmessage.c; path = libsecurity_smime/lib/cmsmessage.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E6D2115886A0014647E /* cmssigdata.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmssigdata.c; path = libsecurity_smime/lib/cmssigdata.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E6E2115886A0014647E /* cmscipher.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmscipher.c; path = libsecurity_smime/lib/cmscipher.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E6F2115886A0014647E /* cmsencdata.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsencdata.c; path = libsecurity_smime/lib/cmsencdata.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E712115886B0014647E /* CMSUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CMSUtils.h; path = libsecurity_smime/lib/CMSUtils.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E722115886B0014647E /* smimeutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = smimeutil.c; path = libsecurity_smime/lib/smimeutil.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E732115886C0014647E /* cmsdecode.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsdecode.c; path = libsecurity_smime/lib/cmsdecode.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E742115886C0014647E /* plhash.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = plhash.c; path = libsecurity_smime/lib/plhash.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E752115886C0014647E /* cmslocal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cmslocal.h; path = libsecurity_smime/lib/cmslocal.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E762115886D0014647E /* CMSUtils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = CMSUtils.c; path = libsecurity_smime/lib/CMSUtils.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E772115886D0014647E /* cmsasn1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsasn1.c; path = libsecurity_smime/lib/cmsasn1.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E782115886D0014647E /* cmsutil.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsutil.c; path = libsecurity_smime/lib/cmsutil.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E792115886E0014647E /* secoid.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = secoid.c; path = libsecurity_smime/lib/secoid.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E7A2115886E0014647E /* SecSMIMEPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecSMIMEPriv.h; path = libsecurity_smime/lib/SecSMIMEPriv.h; sourceTree = SOURCE_ROOT; };
+               D4CF6E7B2115886E0014647E /* cmsdigdata.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsdigdata.c; path = libsecurity_smime/lib/cmsdigdata.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E7C2115886F0014647E /* CMSEncoder.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = CMSEncoder.c; path = libsecurity_smime/lib/CMSEncoder.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E7D2115886F0014647E /* cmsenvdata.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsenvdata.c; path = libsecurity_smime/lib/cmsenvdata.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E7F211588700014647E /* cmsrecinfo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = cmsrecinfo.c; path = libsecurity_smime/lib/cmsrecinfo.c; sourceTree = SOURCE_ROOT; };
+               D4CF6E81211588710014647E /* SecAsn1Item.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecAsn1Item.h; path = libsecurity_smime/lib/SecAsn1Item.h; sourceTree = SOURCE_ROOT; };

                D4CFAA7D1E660BB3004746AA /* si-32-sectrust-pinning-required.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-32-sectrust-pinning-required.m"; 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>"; };

+               D4D1FDDC21165F8B003538E2 /* libsecurity_cms_regressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_cms_regressions.a; sourceTree = BUILT_PRODUCTS_DIR; };

                D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "spbkdf-01-hmac-sha256.c"; sourceTree = "<group>"; };
                D4D886BE1CEB9F3B00DC7583 /* ssl-policy-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "ssl-policy-certs"; sourceTree = "<group>"; };
                D4D886E81CEBDD2A00DC7583 /* nist-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "nist-certs"; sourceTree = "<group>"; };
                D4D718341E04A721000AE7A6 /* spbkdf-01-hmac-sha256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "spbkdf-01-hmac-sha256.c"; sourceTree = "<group>"; };
                D4D886BE1CEB9F3B00DC7583 /* ssl-policy-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "ssl-policy-certs"; sourceTree = "<group>"; };
                D4D886E81CEBDD2A00DC7583 /* nist-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "nist-certs"; sourceTree = "<group>"; };

+               D4D92DA32277E6D10009A7CF /* PathParseTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PathParseTests_data.h; path = tests/TrustTests/EvaluationTests/PathParseTests_data.h; sourceTree = "<group>"; };
+               D4D92DA422788FEB0009A7CF /* NISTTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = NISTTests.m; path = tests/TrustTests/EvaluationTests/NISTTests.m; sourceTree = "<group>"; };
+               D4D92DA72278904F0009A7CF /* nist-certs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "nist-certs"; path = "SecurityTests/nist-certs"; sourceTree = "<group>"; };
+               D4EA5CF622B225C000883439 /* LoggingServerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LoggingServerTests.m; path = tests/TrustTests/DaemonTests/LoggingServerTests.m; sourceTree = "<group>"; };

                D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-20-sectrust-policies-data"; path = "../OSX/shared_regressions/si-20-sectrust-policies-data"; sourceTree = "<group>"; };
                D4EC94FA1CEA482D0083E753 /* si-20-sectrust-policies-data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "si-20-sectrust-policies-data"; path = "../OSX/shared_regressions/si-20-sectrust-policies-data"; sourceTree = "<group>"; };

-               D4FBBD601DD66196004408F7 /* CMSEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMSEncoder.h; sourceTree = "<group>"; };
-               D4FBBD611DD66196004408F7 /* CMSDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMSDecoder.h; sourceTree = "<group>"; };
+               D4EF321E215F0F76000A31A5 /* SecTrustStoreServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecTrustStoreServer.m; sourceTree = "<group>"; };
+               D4EF3222215F102F000A31A5 /* CTTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CTTests_data.h; path = tests/TrustTests/EvaluationTests/CTTests_data.h; sourceTree = "<group>"; };

                D4FC521C1EC3E05B00E99785 /* smime_attr_emails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = smime_attr_emails.h; sourceTree = "<group>"; };
                D4FC521C1EC3E05B00E99785 /* smime_attr_emails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = smime_attr_emails.h; sourceTree = "<group>"; };

+               D4FD421B217D7891002B7EE2 /* NameConstraintsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = NameConstraintsTests.m; path = tests/TrustTests/EvaluationTests/NameConstraintsTests.m; sourceTree = "<group>"; };
+               D4FD421E217D78BB002B7EE2 /* NameConstraintsTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NameConstraintsTests_data.h; path = tests/TrustTests/EvaluationTests/NameConstraintsTests_data.h; sourceTree = "<group>"; };
+               D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PathScoringTests.m; path = tests/TrustTests/EvaluationTests/PathScoringTests.m; sourceTree = "<group>"; };
+               D4FD4222217D7B48002B7EE2 /* PathScoringTests_data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PathScoringTests_data.h; path = tests/TrustTests/EvaluationTests/PathScoringTests_data.h; sourceTree = "<group>"; };
+               D4FD4223217D7BE3002B7EE2 /* libarchive.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libarchive.2.tbd; path = usr/lib/libarchive.2.tbd; sourceTree = SDKROOT; };
+               DA2C402D2189302E005F1CC3 /* mach_notify.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = mach_notify.defs; sourceTree = "<group>"; };
+               DA2F591523A32BB400C30285 /* SoftLinking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SoftLinking.framework; path = System/Library/PrivateFrameworks/SoftLinking.framework; sourceTree = SDKROOT; };

                DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainSyncAccountUpdater.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                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>"; };
                DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainSyncAccountUpdater.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                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>"; };

-               DA5B871A2065A8410093F083 /* SecAutorelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAutorelease.h; path = src/SecAutorelease.h; sourceTree = "<group>"; };
-               DA5B871B2065A8430093F083 /* SecAutorelease.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecAutorelease.m; path = src/SecAutorelease.m; sourceTree = "<group>"; };
+               DA3AD8682319AA310049AFD6 /* TPStringTableTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPStringTableTests.m; sourceTree = "<group>"; };
+               DA41FE0E2241ADC000838FB3 /* otpaird */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = otpaird; sourceTree = BUILT_PRODUCTS_DIR; };
+               DA41FE192241AF3E00838FB3 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               DA4586572245AEDA0073F993 /* OTPairingService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPairingService.h; sourceTree = "<group>"; };
+               DA4586592245AEDA0073F993 /* OTPairingService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPairingService.m; sourceTree = "<group>"; };
+               DA45865A2245AEDB0073F993 /* otpaird.watchos.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = otpaird.watchos.entitlements; sourceTree = "<group>"; };
+               DA45865B2245AEDB0073F993 /* otpaird.iphoneos.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = otpaird.iphoneos.entitlements; sourceTree = "<group>"; };
+               DA5B871A2065A8410093F083 /* SecAutorelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecAutorelease.h; sourceTree = "<group>"; };
+               DA5B871B2065A8430093F083 /* SecAutorelease.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecAutorelease.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>"; };
                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>"; };

+               DA700FC62310C0DF0051A7DE /* TPStringTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPStringTable.h; sourceTree = "<group>"; };
+               DA700FC82310C0E00051A7DE /* TPStringTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPStringTable.m; 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>"; };
                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>"; };

+               DAC58D1C2244527E00D4CD41 /* OTPairingPacketContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPairingPacketContext.h; sourceTree = "<group>"; };
+               DAC58D1D2244527F00D4CD41 /* com.apple.security.otpaird.watchos.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.otpaird.watchos.plist; sourceTree = "<group>"; };
+               DAC58D1E2244528000D4CD41 /* OTPairingPacketContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTPairingPacketContext.m; sourceTree = "<group>"; };
+               DAC58D1F2244528100D4CD41 /* com.apple.security.otpaird.iphoneos.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.otpaird.iphoneos.plist; sourceTree = "<group>"; };
+               DACAD627229F6E690002BBC3 /* OTPairingSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTPairingSession.h; sourceTree = "<group>"; };
+               DACAD629229F6E6A0002BBC3 /* OTPairingSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OTPairingSession.m; sourceTree = "<group>"; };

                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemcanarytest; sourceTree = BUILT_PRODUCTS_DIR; };
                DAE40BD720CF3F04002D5674 /* secitemcanarytest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = secitemcanarytest.entitlements; sourceTree = "<group>"; };
                DAE40BD820CF3F04002D5674 /* secitemcanarytest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secitemcanarytest.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>"; };
                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemcanarytest; sourceTree = BUILT_PRODUCTS_DIR; };
                DAE40BD720CF3F04002D5674 /* secitemcanarytest.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = secitemcanarytest.entitlements; sourceTree = "<group>"; };
                DAE40BD820CF3F04002D5674 /* secitemcanarytest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secitemcanarytest.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>"; };

+               DAEF8E55225819EE00F7DF79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               DAEF8E57225819EF00F7DF79 /* OTPairingClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTPairingClient.m; sourceTree = "<group>"; };
+               DAEF8E58225819EF00F7DF79 /* OTPairingClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPairingClient.h; sourceTree = "<group>"; };
+               DAEF8E59225819F000F7DF79 /* OTPairingConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPairingConstants.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; };
                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; };

+               DC04707F218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTCuttlefishAccountStateHolder.h; sourceTree = "<group>"; };
+               DC047080218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTCuttlefishAccountStateHolder.m; sourceTree = "<group>"; };
+               DC047085218BCEF20078BDAA /* OTOperationDependencies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTOperationDependencies.h; sourceTree = "<group>"; };
+               DC047086218BCEF20078BDAA /* OTOperationDependencies.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTOperationDependencies.m; sourceTree = "<group>"; };
+               DC05037621409A4000A8EDB7 /* OCMockUmbrella.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OCMockUmbrella.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC05037821409A4100A8EDB7 /* OCMockUmbrella.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OCMockUmbrella.h; sourceTree = "<group>"; };
+               DC05037921409A4100A8EDB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               DC061A6E246211DD0026ADB3 /* CKKSLocalResetOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSLocalResetOperation.h; sourceTree = "<group>"; };
+               DC061A70246211DE0026ADB3 /* CKKSLocalResetOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSLocalResetOperation.m; sourceTree = "<group>"; };
+               DC07090222936BCC002711B9 /* OctagonTests+ErrorHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+ErrorHandling.swift"; sourceTree = "<group>"; };

                DC08D1C21E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudKitKeychainSyncingMockXCTest.h; sourceTree = "<group>"; };
                DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloudKitKeychainSyncingMockXCTest.m; sourceTree = "<group>"; };
                DC08D1CB1E64FCC5006237DA /* CKKSSOSTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSOSTests.m; sourceTree = "<group>"; };
                DC08D1C21E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudKitKeychainSyncingMockXCTest.h; sourceTree = "<group>"; };
                DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloudKitKeychainSyncingMockXCTest.m; sourceTree = "<group>"; };
                DC08D1CB1E64FCC5006237DA /* CKKSSOSTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSOSTests.m; sourceTree = "<group>"; };


@@ -10532,24 +13031,12 @@
                DC0BC5EE1D8B745700070CB0 /* comcryptPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comcryptPriv.h; sourceTree = "<group>"; };
                DC0BC5EF1D8B745700070CB0 /* comDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comDebug.h; sourceTree = "<group>"; };
                DC0BC5FF1D8B752B00070CB0 /* libsecurity_cryptkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_cryptkit.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BC5EE1D8B745700070CB0 /* comcryptPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comcryptPriv.h; sourceTree = "<group>"; };
                DC0BC5EF1D8B745700070CB0 /* comDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comDebug.h; sourceTree = "<group>"; };
                DC0BC5FF1D8B752B00070CB0 /* libsecurity_cryptkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_cryptkit.a; sourceTree = BUILT_PRODUCTS_DIR; };

-               DC0BC6011D8B755200070CB0 /* feeCipherFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeCipherFile.c; sourceTree = "<group>"; };
-               DC0BC6021D8B755200070CB0 /* feeCipherFileAtom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeCipherFileAtom.c; sourceTree = "<group>"; };

                DC0BC6031D8B755200070CB0 /* byteRep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = byteRep.c; sourceTree = "<group>"; };
                DC0BC6041D8B755200070CB0 /* byteRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = byteRep.h; sourceTree = "<group>"; };
                DC0BC6031D8B755200070CB0 /* byteRep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = byteRep.c; sourceTree = "<group>"; };
                DC0BC6041D8B755200070CB0 /* byteRep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = byteRep.h; sourceTree = "<group>"; };

-               DC0BC6051D8B755200070CB0 /* CipherFileDES.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CipherFileDES.c; sourceTree = "<group>"; };
-               DC0BC6061D8B755200070CB0 /* CipherFileDES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CipherFileDES.h; sourceTree = "<group>"; };
-               DC0BC6071D8B755200070CB0 /* CipherFileFEED.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CipherFileFEED.c; sourceTree = "<group>"; };
-               DC0BC6081D8B755200070CB0 /* CipherFileFEED.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CipherFileFEED.h; sourceTree = "<group>"; };
-               DC0BC6091D8B755200070CB0 /* CipherFileTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CipherFileTypes.h; sourceTree = "<group>"; };

                DC0BC60A1D8B755200070CB0 /* ckconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckconfig.h; sourceTree = "<group>"; };
                DC0BC60A1D8B755200070CB0 /* ckconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckconfig.h; sourceTree = "<group>"; };

-               DC0BC60B1D8B755200070CB0 /* ckDES.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckDES.c; sourceTree = "<group>"; };
-               DC0BC60C1D8B755200070CB0 /* ckDES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckDES.h; sourceTree = "<group>"; };
-               DC0BC60D1D8B755200070CB0 /* ckMD5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckMD5.c; sourceTree = "<group>"; };

                DC0BC60E1D8B755200070CB0 /* ckMD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckMD5.h; sourceTree = "<group>"; };
                DC0BC60F1D8B755200070CB0 /* ckSHA1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckSHA1.c; sourceTree = "<group>"; };
                DC0BC6101D8B755200070CB0 /* ckSHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckSHA1.h; sourceTree = "<group>"; };
                DC0BC60E1D8B755200070CB0 /* ckMD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckMD5.h; sourceTree = "<group>"; };
                DC0BC60F1D8B755200070CB0 /* ckSHA1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckSHA1.c; sourceTree = "<group>"; };
                DC0BC6101D8B755200070CB0 /* ckSHA1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckSHA1.h; sourceTree = "<group>"; };

-               DC0BC6111D8B755200070CB0 /* ckSHA1_priv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ckSHA1_priv.c; sourceTree = "<group>"; };
-               DC0BC6121D8B755200070CB0 /* ckSHA1_priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ckSHA1_priv.h; sourceTree = "<group>"; };

                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>"; };
                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>"; };


@@ -10558,11 +13045,9 @@
                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptKitDER.cpp; sourceTree = "<group>"; };
                DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptKitDER.h; sourceTree = "<group>"; };
                DC0BC61C1D8B755200070CB0 /* curveParamData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curveParamData.h; sourceTree = "<group>"; };
                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptKitDER.cpp; sourceTree = "<group>"; };
                DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptKitDER.h; sourceTree = "<group>"; };
                DC0BC61C1D8B755200070CB0 /* curveParamData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curveParamData.h; sourceTree = "<group>"; };

-               DC0BC61D1D8B755200070CB0 /* curveParamDataOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curveParamDataOld.h; sourceTree = "<group>"; };

                DC0BC61E1D8B755200070CB0 /* curveParams.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curveParams.c; sourceTree = "<group>"; };
                DC0BC61F1D8B755200070CB0 /* curveParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curveParams.h; sourceTree = "<group>"; };
                DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECDSA_Profile.h; sourceTree = "<group>"; };
                DC0BC61E1D8B755200070CB0 /* curveParams.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curveParams.c; sourceTree = "<group>"; };
                DC0BC61F1D8B755200070CB0 /* curveParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curveParams.h; sourceTree = "<group>"; };
                DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECDSA_Profile.h; sourceTree = "<group>"; };

-               DC0BC6211D8B755200070CB0 /* ECDSA_Verify_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECDSA_Verify_Prefix.h; sourceTree = "<group>"; };

                DC0BC6221D8B755200070CB0 /* elliptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = elliptic.c; sourceTree = "<group>"; };
                DC0BC6231D8B755200070CB0 /* elliptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elliptic.h; sourceTree = "<group>"; };
                DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ellipticMeasure.h; sourceTree = "<group>"; };
                DC0BC6221D8B755200070CB0 /* elliptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = elliptic.c; sourceTree = "<group>"; };
                DC0BC6231D8B755200070CB0 /* elliptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elliptic.h; sourceTree = "<group>"; };
                DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ellipticMeasure.h; sourceTree = "<group>"; };


@@ -10570,13 +13055,9 @@
                DC0BC6261D8B755200070CB0 /* ellipticProj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ellipticProj.h; sourceTree = "<group>"; };
                DC0BC6271D8B755200070CB0 /* enc64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = enc64.c; sourceTree = "<group>"; };
                DC0BC6281D8B755200070CB0 /* enc64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enc64.h; sourceTree = "<group>"; };
                DC0BC6261D8B755200070CB0 /* ellipticProj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ellipticProj.h; sourceTree = "<group>"; };
                DC0BC6271D8B755200070CB0 /* enc64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = enc64.c; sourceTree = "<group>"; };
                DC0BC6281D8B755200070CB0 /* enc64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enc64.h; sourceTree = "<group>"; };

-               DC0BC6291D8B755200070CB0 /* engineNSA127.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = engineNSA127.c; sourceTree = "<group>"; };

                DC0BC62A1D8B755200070CB0 /* falloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = falloc.c; sourceTree = "<group>"; };
                DC0BC62B1D8B755200070CB0 /* falloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = falloc.h; sourceTree = "<group>"; };
                DC0BC62A1D8B755200070CB0 /* falloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = falloc.c; sourceTree = "<group>"; };
                DC0BC62B1D8B755200070CB0 /* falloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = falloc.h; sourceTree = "<group>"; };

-               DC0BC62C1D8B755200070CB0 /* feeCipherFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeCipherFile.h; sourceTree = "<group>"; };

                DC0BC62D1D8B755200070CB0 /* feeDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeDebug.h; sourceTree = "<group>"; };
                DC0BC62D1D8B755200070CB0 /* feeDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeDebug.h; sourceTree = "<group>"; };

-               DC0BC62E1D8B755200070CB0 /* feeDES.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeDES.c; sourceTree = "<group>"; };
-               DC0BC62F1D8B755200070CB0 /* feeDES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeDES.h; sourceTree = "<group>"; };

                DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeDigitalSignature.c; sourceTree = "<group>"; };
                DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeDigitalSignature.h; sourceTree = "<group>"; };
                DC0BC6321D8B755200070CB0 /* feeECDSA.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeECDSA.c; sourceTree = "<group>"; };
                DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeDigitalSignature.c; sourceTree = "<group>"; };
                DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = feeDigitalSignature.h; sourceTree = "<group>"; };
                DC0BC6321D8B755200070CB0 /* feeECDSA.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = feeECDSA.c; sourceTree = "<group>"; };


@@ -10597,11 +13078,6 @@
                DC0BC6411D8B755200070CB0 /* giantIntegers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = giantIntegers.c; sourceTree = "<group>"; };
                DC0BC6421D8B755200070CB0 /* giantIntegers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantIntegers.h; sourceTree = "<group>"; };
                DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPort_Generic.h; sourceTree = "<group>"; };
                DC0BC6411D8B755200070CB0 /* giantIntegers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = giantIntegers.c; sourceTree = "<group>"; };
                DC0BC6421D8B755200070CB0 /* giantIntegers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantIntegers.h; sourceTree = "<group>"; };
                DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPort_Generic.h; sourceTree = "<group>"; };

-               DC0BC6441D8B755200070CB0 /* giantPort_i486.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPort_i486.h; sourceTree = "<group>"; };
-               DC0BC6451D8B755200070CB0 /* giantPort_PPC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = giantPort_PPC.c; sourceTree = "<group>"; };
-               DC0BC6461D8B755200070CB0 /* giantPort_PPC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPort_PPC.h; sourceTree = "<group>"; };
-               DC0BC6471D8B755200070CB0 /* giantPort_PPC_Gnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPort_PPC_Gnu.h; sourceTree = "<group>"; };
-               DC0BC6481D8B755200070CB0 /* giantPort_PPC_Gnu.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = giantPort_PPC_Gnu.s; sourceTree = "<group>"; };

                DC0BC6491D8B755200070CB0 /* giantPortCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPortCommon.h; sourceTree = "<group>"; };
                DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = HmacSha1Legacy.c; sourceTree = "<group>"; };
                DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HmacSha1Legacy.h; sourceTree = "<group>"; };
                DC0BC6491D8B755200070CB0 /* giantPortCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = giantPortCommon.h; sourceTree = "<group>"; };
                DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = HmacSha1Legacy.c; sourceTree = "<group>"; };
                DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HmacSha1Legacy.h; sourceTree = "<group>"; };


@@ -10779,7 +13255,6 @@
                DC0BC9ED1D8B827200070CB0 /* sslRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslRecord.h; sourceTree = "<group>"; };
                DC0BC9F01D8B827200070CB0 /* sslCrypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslCrypto.c; sourceTree = "<group>"; };
                DC0BC9F21D8B827200070CB0 /* sslMemory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslMemory.c; sourceTree = "<group>"; };
                DC0BC9ED1D8B827200070CB0 /* sslRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sslRecord.h; sourceTree = "<group>"; };
                DC0BC9F01D8B827200070CB0 /* sslCrypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslCrypto.c; sourceTree = "<group>"; };
                DC0BC9F21D8B827200070CB0 /* sslMemory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslMemory.c; sourceTree = "<group>"; };

-               DC0BC9F31D8B827200070CB0 /* sslUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sslUtils.c; sourceTree = "<group>"; };

                DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_ssl_regressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BCA1B1D8B82CD00070CB0 /* CA-ECC_Cert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CA-ECC_Cert.h"; sourceTree = "<group>"; };
                DC0BCA1C1D8B82CD00070CB0 /* CA-ECC_Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CA-ECC_Key.h"; sourceTree = "<group>"; };
                DC0BCA1A1D8B82B000070CB0 /* libsecurity_ssl_regressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_ssl_regressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BCA1B1D8B82CD00070CB0 /* CA-ECC_Cert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CA-ECC_Cert.h"; sourceTree = "<group>"; };
                DC0BCA1C1D8B82CD00070CB0 /* CA-ECC_Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CA-ECC_Key.h"; sourceTree = "<group>"; };


@@ -10922,63 +13397,63 @@
                DC0BCC091D8C64B500070CB0 /* testpolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = testpolicy.h; path = OSX/regressions/test/testpolicy.h; sourceTree = "<group>"; };
                DC0BCC0A1D8C64B500070CB0 /* testpolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = testpolicy.m; path = OSX/regressions/test/testpolicy.m; sourceTree = "<group>"; };
                DC0BCC361D8C684F00070CB0 /* libutilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libutilities.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BCC091D8C64B500070CB0 /* testpolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = testpolicy.h; path = OSX/regressions/test/testpolicy.h; sourceTree = "<group>"; };
                DC0BCC0A1D8C64B500070CB0 /* testpolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = testpolicy.m; path = OSX/regressions/test/testpolicy.m; sourceTree = "<group>"; };
                DC0BCC361D8C684F00070CB0 /* libutilities.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libutilities.a; sourceTree = BUILT_PRODUCTS_DIR; };

-               DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = iCloudKeychainTrace.c; path = src/iCloudKeychainTrace.c; sourceTree = "<group>"; };
-               DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iCloudKeychainTrace.h; path = src/iCloudKeychainTrace.h; sourceTree = "<group>"; };
-               DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecAKSWrappers.c; path = src/SecAKSWrappers.c; sourceTree = "<group>"; };
-               DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAKSWrappers.h; path = src/SecAKSWrappers.h; sourceTree = "<group>"; };
-               DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecBuffer.c; path = src/SecBuffer.c; sourceTree = "<group>"; };
-               DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecBuffer.h; path = src/SecBuffer.h; sourceTree = "<group>"; };
-               DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCoreCrypto.c; path = src/SecCoreCrypto.c; sourceTree = "<group>"; };
-               DC0BCC411D8C68CF00070CB0 /* SecCoreCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCoreCrypto.h; path = src/SecCoreCrypto.h; sourceTree = "<group>"; };
-               DC0BCC441D8C68CF00070CB0 /* SecCFCCWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCFCCWrappers.c; path = src/SecCFCCWrappers.c; sourceTree = "<group>"; };
-               DC0BCC451D8C68CF00070CB0 /* SecCFCCWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCFCCWrappers.h; path = src/SecCFCCWrappers.h; sourceTree = "<group>"; };
-               DC0BCC461D8C68CF00070CB0 /* SecCFRelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCFRelease.h; path = src/SecCFRelease.h; sourceTree = "<group>"; };
-               DC0BCC471D8C68CF00070CB0 /* SecCFWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCFWrappers.c; path = src/SecCFWrappers.c; sourceTree = "<group>"; };
-               DC0BCC481D8C68CF00070CB0 /* SecCFWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = SecCFWrappers.h; path = src/SecCFWrappers.h; sourceTree = "<group>"; };
-               DC0BCC491D8C68CF00070CB0 /* SecCFError.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecCFError.c; path = src/SecCFError.c; sourceTree = "<group>"; };
-               DC0BCC4A1D8C68CF00070CB0 /* SecCFError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCFError.h; path = src/SecCFError.h; sourceTree = "<group>"; };
-               DC0BCC4B1D8C68CF00070CB0 /* SecDispatchRelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecDispatchRelease.h; path = src/SecDispatchRelease.h; sourceTree = "<group>"; };
-               DC0BCC4C1D8C68CF00070CB0 /* SecIOFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIOFormat.h; path = src/SecIOFormat.h; sourceTree = "<group>"; };
-               DC0BCC4D1D8C68CF00070CB0 /* SecTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecTrace.c; path = src/SecTrace.c; sourceTree = "<group>"; };
-               DC0BCC4E1D8C68CF00070CB0 /* SecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTrace.h; path = src/SecTrace.h; sourceTree = "<group>"; };
-               DC0BCC4F1D8C68CF00070CB0 /* array_size.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = array_size.h; path = src/array_size.h; sourceTree = "<group>"; };
-               DC0BCC521D8C68CF00070CB0 /* debugging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = debugging.c; path = src/debugging.c; sourceTree = "<group>"; };
-               DC0BCC531D8C68CF00070CB0 /* debugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = debugging.h; path = src/debugging.h; sourceTree = "<group>"; };
-               DC0BCC541D8C68CF00070CB0 /* debugging_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = debugging_test.h; path = src/debugging_test.h; sourceTree = "<group>"; };
-               DC0BCC551D8C68CF00070CB0 /* der_array.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_array.c; path = src/der_array.c; sourceTree = "<group>"; };
-               DC0BCC561D8C68CF00070CB0 /* der_boolean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_boolean.c; path = src/der_boolean.c; sourceTree = "<group>"; };
-               DC0BCC571D8C68CF00070CB0 /* der_null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_null.c; path = src/der_null.c; sourceTree = "<group>"; };
-               DC0BCC581D8C68CF00070CB0 /* der_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_data.c; path = src/der_data.c; sourceTree = "<group>"; };
-               DC0BCC591D8C68CF00070CB0 /* der_date.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = der_date.c; path = src/der_date.c; sourceTree = "<group>"; };
-               DC0BCC5A1D8C68CF00070CB0 /* der_date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_date.h; path = src/der_date.h; sourceTree = "<group>"; };
-               DC0BCC5B1D8C68CF00070CB0 /* der_dictionary.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_dictionary.c; path = src/der_dictionary.c; sourceTree = "<group>"; };
-               DC0BCC5C1D8C68CF00070CB0 /* der_number.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_number.c; path = src/der_number.c; sourceTree = "<group>"; };
-               DC0BCC5D1D8C68CF00070CB0 /* der_plist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_plist.c; path = src/der_plist.c; sourceTree = "<group>"; };
-               DC0BCC5F1D8C68CF00070CB0 /* der_plist_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_plist_internal.c; path = src/der_plist_internal.c; sourceTree = "<group>"; };
-               DC0BCC601D8C68CF00070CB0 /* der_plist_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_plist_internal.h; path = src/der_plist_internal.h; sourceTree = "<group>"; };
-               DC0BCC611D8C68CF00070CB0 /* der_set.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_set.c; path = src/der_set.c; sourceTree = "<group>"; };
-               DC0BCC621D8C68CF00070CB0 /* der_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = der_set.h; path = src/der_set.h; sourceTree = "<group>"; };
-               DC0BCC631D8C68CF00070CB0 /* der_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = der_string.c; path = src/der_string.c; sourceTree = "<group>"; };
-               DC0BCC641D8C68CF00070CB0 /* fileIo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileIo.c; path = src/fileIo.c; sourceTree = "<group>"; };
-               DC0BCC651D8C68CF00070CB0 /* fileIo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fileIo.h; path = src/fileIo.h; sourceTree = "<group>"; };
-               DC0BCC661D8C68CF00070CB0 /* sqlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlutils.h; path = src/sqlutils.h; sourceTree = "<group>"; };
-               DC0BCC671D8C68CF00070CB0 /* iOSforOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSforOSX.h; path = src/iOSforOSX.h; sourceTree = "<group>"; };
-               DC0BCC681D8C68CF00070CB0 /* iOSforOSX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = iOSforOSX.c; path = src/iOSforOSX.c; sourceTree = "<group>"; };
-               DC0BCC691D8C68CF00070CB0 /* iOSforOSX-SecAttr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "iOSforOSX-SecAttr.c"; path = "src/iOSforOSX-SecAttr.c"; sourceTree = "<group>"; };
-               DC0BCC6A1D8C68CF00070CB0 /* iOSforOSX-SecRandom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "iOSforOSX-SecRandom.c"; path = "src/iOSforOSX-SecRandom.c"; sourceTree = "<group>"; };
-               DC0BCC6B1D8C68CF00070CB0 /* SecDb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = SecDb.c; path = src/SecDb.c; sourceTree = "<group>"; };
-               DC0BCC6C1D8C68CF00070CB0 /* SecDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecDb.h; path = src/SecDb.h; sourceTree = "<group>"; };
-               DC0BCC6D1D8C68CF00070CB0 /* SecFileLocations.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecFileLocations.c; path = src/SecFileLocations.c; sourceTree = "<group>"; };
-               DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecFileLocations.h; path = src/SecFileLocations.h; sourceTree = "<group>"; };
-               DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecXPCError.h; path = src/SecXPCError.h; sourceTree = "<group>"; };
-               DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecXPCError.c; path = src/SecXPCError.c; sourceTree = "<group>"; };
-               DC0BCC711D8C68CF00070CB0 /* simulate_crash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = simulate_crash.c; path = src/simulate_crash.c; sourceTree = "<group>"; };
-               DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecSCTUtils.h; path = src/SecSCTUtils.h; sourceTree = "<group>"; };
-               DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecSCTUtils.c; path = src/SecSCTUtils.c; sourceTree = "<group>"; };
-               DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecAppleAnchor.c; path = src/SecAppleAnchor.c; sourceTree = "<group>"; };
-               DC0BCC751D8C68CF00070CB0 /* SecAppleAnchorPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAppleAnchorPriv.h; path = src/SecAppleAnchorPriv.h; sourceTree = "<group>"; };
-               DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecInternalRelease.c; path = src/SecInternalRelease.c; sourceTree = "<group>"; };
-               DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecInternalReleasePriv.h; path = src/SecInternalReleasePriv.h; sourceTree = "<group>"; };
+               DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iCloudKeychainTrace.c; sourceTree = "<group>"; };
+               DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iCloudKeychainTrace.h; sourceTree = "<group>"; };
+               DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAKSWrappers.c; sourceTree = "<group>"; };
+               DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecAKSWrappers.h; sourceTree = "<group>"; };
+               DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecBuffer.c; sourceTree = "<group>"; };
+               DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBuffer.h; sourceTree = "<group>"; };
+               DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCoreCrypto.c; sourceTree = "<group>"; };
+               DC0BCC411D8C68CF00070CB0 /* SecCoreCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCoreCrypto.h; sourceTree = "<group>"; };
+               DC0BCC441D8C68CF00070CB0 /* SecCFCCWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCFCCWrappers.c; sourceTree = "<group>"; };
+               DC0BCC451D8C68CF00070CB0 /* SecCFCCWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFCCWrappers.h; sourceTree = "<group>"; };
+               DC0BCC461D8C68CF00070CB0 /* SecCFRelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFRelease.h; sourceTree = "<group>"; };
+               DC0BCC471D8C68CF00070CB0 /* SecCFWrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCFWrappers.c; sourceTree = "<group>"; };
+               DC0BCC481D8C68CF00070CB0 /* SecCFWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SecCFWrappers.h; sourceTree = "<group>"; };
+               DC0BCC491D8C68CF00070CB0 /* SecCFError.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCFError.c; sourceTree = "<group>"; };
+               DC0BCC4A1D8C68CF00070CB0 /* SecCFError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFError.h; sourceTree = "<group>"; };
+               DC0BCC4B1D8C68CF00070CB0 /* SecDispatchRelease.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDispatchRelease.h; sourceTree = "<group>"; };
+               DC0BCC4C1D8C68CF00070CB0 /* SecIOFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecIOFormat.h; sourceTree = "<group>"; };
+               DC0BCC4D1D8C68CF00070CB0 /* SecTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecTrace.c; sourceTree = "<group>"; };
+               DC0BCC4E1D8C68CF00070CB0 /* SecTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecTrace.h; sourceTree = "<group>"; };
+               DC0BCC4F1D8C68CF00070CB0 /* array_size.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = array_size.h; sourceTree = "<group>"; };
+               DC0BCC521D8C68CF00070CB0 /* debugging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = debugging.c; sourceTree = "<group>"; };
+               DC0BCC531D8C68CF00070CB0 /* debugging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = debugging.h; sourceTree = "<group>"; };
+               DC0BCC541D8C68CF00070CB0 /* debugging_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugging_test.h; sourceTree = "<group>"; };
+               DC0BCC551D8C68CF00070CB0 /* der_array.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_array.c; sourceTree = "<group>"; };
+               DC0BCC561D8C68CF00070CB0 /* der_boolean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_boolean.c; sourceTree = "<group>"; };
+               DC0BCC571D8C68CF00070CB0 /* der_null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_null.c; sourceTree = "<group>"; };
+               DC0BCC581D8C68CF00070CB0 /* der_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_data.c; sourceTree = "<group>"; };
+               DC0BCC591D8C68CF00070CB0 /* der_date.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = der_date.c; sourceTree = "<group>"; };
+               DC0BCC5A1D8C68CF00070CB0 /* der_date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = der_date.h; sourceTree = "<group>"; };
+               DC0BCC5B1D8C68CF00070CB0 /* der_dictionary.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_dictionary.c; sourceTree = "<group>"; };
+               DC0BCC5C1D8C68CF00070CB0 /* der_number.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_number.c; sourceTree = "<group>"; };
+               DC0BCC5D1D8C68CF00070CB0 /* der_plist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_plist.c; sourceTree = "<group>"; };
+               DC0BCC5F1D8C68CF00070CB0 /* der_plist_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_plist_internal.c; sourceTree = "<group>"; };
+               DC0BCC601D8C68CF00070CB0 /* der_plist_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = der_plist_internal.h; sourceTree = "<group>"; };
+               DC0BCC611D8C68CF00070CB0 /* der_set.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_set.c; sourceTree = "<group>"; };
+               DC0BCC621D8C68CF00070CB0 /* der_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = der_set.h; sourceTree = "<group>"; };
+               DC0BCC631D8C68CF00070CB0 /* der_string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = der_string.c; sourceTree = "<group>"; };
+               DC0BCC641D8C68CF00070CB0 /* fileIo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fileIo.c; sourceTree = "<group>"; };
+               DC0BCC651D8C68CF00070CB0 /* fileIo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileIo.h; sourceTree = "<group>"; };
+               DC0BCC661D8C68CF00070CB0 /* sqlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlutils.h; sourceTree = "<group>"; };
+               DC0BCC671D8C68CF00070CB0 /* iOSforOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iOSforOSX.h; sourceTree = "<group>"; };
+               DC0BCC681D8C68CF00070CB0 /* iOSforOSX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iOSforOSX.c; sourceTree = "<group>"; };
+               DC0BCC691D8C68CF00070CB0 /* iOSforOSX-SecAttr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iOSforOSX-SecAttr.c"; sourceTree = "<group>"; };
+               DC0BCC6A1D8C68CF00070CB0 /* iOSforOSX-SecRandom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iOSforOSX-SecRandom.c"; sourceTree = "<group>"; };
+               DC0BCC6B1D8C68CF00070CB0 /* SecDb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SecDb.c; sourceTree = "<group>"; };
+               DC0BCC6C1D8C68CF00070CB0 /* SecDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDb.h; sourceTree = "<group>"; };
+               DC0BCC6D1D8C68CF00070CB0 /* SecFileLocations.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecFileLocations.c; sourceTree = "<group>"; };
+               DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecFileLocations.h; sourceTree = "<group>"; };
+               DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecXPCError.h; sourceTree = "<group>"; };
+               DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecXPCError.c; sourceTree = "<group>"; };
+               DC0BCC711D8C68CF00070CB0 /* simulate_crash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = simulate_crash.m; sourceTree = "<group>"; };
+               DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSCTUtils.h; sourceTree = "<group>"; };
+               DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecSCTUtils.c; sourceTree = "<group>"; };
+               DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAppleAnchor.c; sourceTree = "<group>"; };
+               DC0BCC751D8C68CF00070CB0 /* SecAppleAnchorPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecAppleAnchorPriv.h; sourceTree = "<group>"; };
+               DC0BCC761D8C68CF00070CB0 /* SecInternalRelease.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecInternalRelease.c; sourceTree = "<group>"; };
+               DC0BCC771D8C68CF00070CB0 /* SecInternalReleasePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecInternalReleasePriv.h; sourceTree = "<group>"; };

                DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libutilitiesRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BCD491D8C697100070CB0 /* utilities_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilities_regressions.h; sourceTree = "<group>"; };
                DC0BCD4A1D8C697100070CB0 /* su-05-cfwrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "su-05-cfwrappers.c"; sourceTree = "<group>"; };
                DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libutilitiesRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC0BCD491D8C697100070CB0 /* utilities_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utilities_regressions.h; sourceTree = "<group>"; };
                DC0BCD4A1D8C697100070CB0 /* su-05-cfwrappers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "su-05-cfwrappers.c"; sourceTree = "<group>"; };


@@ -10995,8 +13470,18 @@
                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>"; };
                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>"; };
+               DC0BD4EF21BB05F2006B9154 /* CKKSKeychainBackedKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSKeychainBackedKey.h; sourceTree = "<group>"; };
+               DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSKeychainBackedKey.m; sourceTree = "<group>"; };
+               DC0D15FF2363A1D6007F0951 /* OTSetCDPBitOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSetCDPBitOperation.h; sourceTree = "<group>"; };
+               DC0D16002363A1D6007F0951 /* OTSetCDPBitOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSetCDPBitOperation.m; sourceTree = "<group>"; };
+               DC0D16042363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTDetermineCDPBitStatusOperation.h; sourceTree = "<group>"; };
+               DC0D16052363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTDetermineCDPBitStatusOperation.m; sourceTree = "<group>"; };
+               DC0EF8EF208697C600AB9E95 /* tpctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tpctl; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC0EF8F1208697C600AB9E95 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+               DC0FA6AE2291F63F00FE01C4 /* OctagonPendingFlag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonPendingFlag.h; sourceTree = "<group>"; };
+               DC0FA6AF2291F63F00FE01C4 /* OctagonPendingFlag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonPendingFlag.m; sourceTree = "<group>"; };
+               DC124DC120059B8700BE8DAC /* OctagonControlServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonControlServer.h; sourceTree = "<group>"; };
+               DC124DC220059B8700BE8DAC /* OctagonControlServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 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>"; };
                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>"; };


@@ -11004,8 +13489,6 @@
                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>"; };
                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>"; };

                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>"; };
                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>"; };


@@ -11062,8 +13545,6 @@
                DC1785831D778B7F00B50D50 /* SecCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCode.h; path = lib/SecCode.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>"; };
                DC1785831D778B7F00B50D50 /* SecCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCode.h; path = lib/SecCode.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>"; };
-               DC17858F1D778B9D00B50D50 /* CMSEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSEncoder.h; path = OSX/libsecurity_cms/lib/CMSEncoder.h; sourceTree = "<group>"; };

                DC1785981D778C5300B50D50 /* cssmapple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cssmapple.h; path = cssm/cssmapple.h; sourceTree = "<group>"; };
                DC1785A31D778D0D00B50D50 /* CipherSuite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CipherSuite.h; path = OSX/libsecurity_ssl/lib/CipherSuite.h; sourceTree = "<group>"; };
                DC1785A41D778D0D00B50D50 /* SecureTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureTransport.h; path = OSX/libsecurity_ssl/lib/SecureTransport.h; sourceTree = "<group>"; };
                DC1785981D778C5300B50D50 /* cssmapple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cssmapple.h; path = cssm/cssmapple.h; sourceTree = "<group>"; };
                DC1785A31D778D0D00B50D50 /* CipherSuite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CipherSuite.h; path = OSX/libsecurity_ssl/lib/CipherSuite.h; sourceTree = "<group>"; };
                DC1785A41D778D0D00B50D50 /* SecureTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureTransport.h; path = OSX/libsecurity_ssl/lib/SecureTransport.h; sourceTree = "<group>"; };


@@ -11073,28 +13554,10 @@
                DC1786F71D778F2500B50D50 /* SecTransformInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTransformInternal.h; path = OSX/libsecurity_transform/lib/SecTransformInternal.h; sourceTree = "<group>"; };
                DC1786FB1D778F3C00B50D50 /* sslTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sslTypes.h; path = OSX/libsecurity_ssl/lib/sslTypes.h; sourceTree = "<group>"; };
                DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureTransportPriv.h; path = OSX/libsecurity_ssl/lib/SecureTransportPriv.h; sourceTree = "<group>"; };
                DC1786F71D778F2500B50D50 /* SecTransformInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecTransformInternal.h; path = OSX/libsecurity_transform/lib/SecTransformInternal.h; sourceTree = "<group>"; };
                DC1786FB1D778F3C00B50D50 /* sslTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sslTypes.h; path = OSX/libsecurity_ssl/lib/sslTypes.h; sourceTree = "<group>"; };
                DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureTransportPriv.h; path = OSX/libsecurity_ssl/lib/SecureTransportPriv.h; sourceTree = "<group>"; };

-               DC1787001D778FA900B50D50 /* SecCMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCMS.h; sourceTree = "<group>"; };
-               DC1787011D778FA900B50D50 /* SecCmsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsBase.h; sourceTree = "<group>"; };
-               DC1787021D778FA900B50D50 /* SecCmsContentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsContentInfo.h; sourceTree = "<group>"; };
-               DC1787031D778FA900B50D50 /* SecCmsDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsDecoder.h; sourceTree = "<group>"; };
-               DC1787041D778FA900B50D50 /* SecCmsDigestContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsDigestContext.h; sourceTree = "<group>"; };
-               DC1787051D778FA900B50D50 /* SecCmsDigestedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsDigestedData.h; sourceTree = "<group>"; };
-               DC1787061D778FA900B50D50 /* SecCmsEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsEncoder.h; sourceTree = "<group>"; };
-               DC1787071D778FA900B50D50 /* SecCmsEncryptedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsEncryptedData.h; sourceTree = "<group>"; };
-               DC1787081D778FA900B50D50 /* SecCmsEnvelopedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsEnvelopedData.h; sourceTree = "<group>"; };
-               DC1787091D778FA900B50D50 /* SecCmsMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsMessage.h; sourceTree = "<group>"; };
-               DC17870A1D778FA900B50D50 /* SecCmsRecipientInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsRecipientInfo.h; sourceTree = "<group>"; };
-               DC17870B1D778FA900B50D50 /* SecCmsSignedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsSignedData.h; sourceTree = "<group>"; };
-               DC17870C1D778FA900B50D50 /* SecCmsSignerInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCmsSignerInfo.h; sourceTree = "<group>"; };
-               DC17870D1D778FA900B50D50 /* SecSMIME.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSMIME.h; sourceTree = "<group>"; };
-               DC17870E1D778FA900B50D50 /* tsaSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsaSupport.h; sourceTree = "<group>"; };
-               DC17870F1D778FA900B50D50 /* tsaSupportPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsaSupportPriv.h; sourceTree = "<group>"; };
-               DC1787101D778FA900B50D50 /* tsaTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tsaTemplates.h; sourceTree = "<group>"; };

                DC1787221D778FC900B50D50 /* mdspriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdspriv.h; path = OSX/libsecurity_mds/lib/mdspriv.h; sourceTree = "<group>"; };
                DC1787241D778FDE00B50D50 /* SecManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecManifest.h; path = OSX/libsecurity_manifest/lib/SecManifest.h; sourceTree = "<group>"; };
                DC1787251D778FDE00B50D50 /* SecureDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureDownloadInternal.h; path = OSX/libsecurity_manifest/lib/SecureDownloadInternal.h; sourceTree = "<group>"; };
                DC1787281D77903700B50D50 /* SecAccessPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAccessPriv.h; path = OSX/libsecurity_keychain/lib/SecAccessPriv.h; sourceTree = "<group>"; };
                DC1787221D778FC900B50D50 /* mdspriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdspriv.h; path = OSX/libsecurity_mds/lib/mdspriv.h; sourceTree = "<group>"; };
                DC1787241D778FDE00B50D50 /* SecManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecManifest.h; path = OSX/libsecurity_manifest/lib/SecManifest.h; sourceTree = "<group>"; };
                DC1787251D778FDE00B50D50 /* SecureDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecureDownloadInternal.h; path = OSX/libsecurity_manifest/lib/SecureDownloadInternal.h; sourceTree = "<group>"; };
                DC1787281D77903700B50D50 /* SecAccessPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecAccessPriv.h; path = OSX/libsecurity_keychain/lib/SecAccessPriv.h; sourceTree = "<group>"; };

-               DC1787291D77903700B50D50 /* SecCertificateBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecCertificateBundle.h; path = OSX/libsecurity_keychain/lib/SecCertificateBundle.h; sourceTree = "<group>"; };

                DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecFDERecoveryAsymmetricCrypto.h; path = OSX/libsecurity_keychain/lib/SecFDERecoveryAsymmetricCrypto.h; sourceTree = "<group>"; };
                DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentitySearchPriv.h; path = OSX/libsecurity_keychain/lib/SecIdentitySearchPriv.h; sourceTree = "<group>"; };
                DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKeychainItemExtendedAttributes.h; path = OSX/libsecurity_keychain/lib/SecKeychainItemExtendedAttributes.h; sourceTree = "<group>"; };
                DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecFDERecoveryAsymmetricCrypto.h; path = OSX/libsecurity_keychain/lib/SecFDERecoveryAsymmetricCrypto.h; sourceTree = "<group>"; };
                DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecIdentitySearchPriv.h; path = OSX/libsecurity_keychain/lib/SecIdentitySearchPriv.h; sourceTree = "<group>"; };
                DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecKeychainItemExtendedAttributes.h; path = OSX/libsecurity_keychain/lib/SecKeychainItemExtendedAttributes.h; sourceTree = "<group>"; };


@@ -11113,7 +13576,6 @@
                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>"; };
                DC17874C1D7790A500B50D50 /* SecStaticCodePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecStaticCodePriv.h; path = lib/SecStaticCodePriv.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>"; };
                DC17874C1D7790A500B50D50 /* SecStaticCodePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecStaticCodePriv.h; path = lib/SecStaticCodePriv.h; sourceTree = "<group>"; };

-               DC1787581D7790B600B50D50 /* CMSPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMSPrivate.h; path = OSX/libsecurity_cms/lib/CMSPrivate.h; sourceTree = "<group>"; };

                DC17875B1D7790CE00B50D50 /* checkpw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkpw.h; path = OSX/libsecurity_checkpw/lib/checkpw.h; sourceTree = "<group>"; };
                DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthorizationPriv.h; path = OSX/libsecurity_authorization/lib/AuthorizationPriv.h; sourceTree = "<group>"; };
                DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthorizationTagsPriv.h; path = OSX/libsecurity_authorization/lib/AuthorizationTagsPriv.h; sourceTree = "<group>"; };
                DC17875B1D7790CE00B50D50 /* checkpw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkpw.h; path = OSX/libsecurity_checkpw/lib/checkpw.h; sourceTree = "<group>"; };
                DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthorizationPriv.h; path = OSX/libsecurity_authorization/lib/AuthorizationPriv.h; sourceTree = "<group>"; };
                DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthorizationTagsPriv.h; path = OSX/libsecurity_authorization/lib/AuthorizationTagsPriv.h; sourceTree = "<group>"; };


@@ -11126,11 +13588,9 @@
                DC1787671D77911D00B50D50 /* osKeyTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osKeyTemplates.h; path = OSX/libsecurity_asn1/lib/osKeyTemplates.h; sourceTree = "<group>"; };
                DC1787681D77911D00B50D50 /* secasn1t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secasn1t.h; path = OSX/libsecurity_asn1/lib/secasn1t.h; sourceTree = "<group>"; };
                DC1787691D77911D00B50D50 /* X509Templates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X509Templates.h; path = OSX/libsecurity_asn1/lib/X509Templates.h; sourceTree = "<group>"; };
                DC1787671D77911D00B50D50 /* osKeyTemplates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = osKeyTemplates.h; path = OSX/libsecurity_asn1/lib/osKeyTemplates.h; sourceTree = "<group>"; };
                DC1787681D77911D00B50D50 /* secasn1t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = secasn1t.h; path = OSX/libsecurity_asn1/lib/secasn1t.h; sourceTree = "<group>"; };
                DC1787691D77911D00B50D50 /* X509Templates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X509Templates.h; path = OSX/libsecurity_asn1/lib/X509Templates.h; sourceTree = "<group>"; };

-               DC1787731D77915500B50D50 /* SecBreadcrumb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecBreadcrumb.h; path = OSX/Breadcrumb/SecBreadcrumb.h; sourceTree = SOURCE_ROOT; };

                DC1789041D77980500B50D50 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Security.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libDiagnosticMessagesClient.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libDiagnosticMessagesClient.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libOpenScriptingUtil.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libOpenScriptingUtil.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789041D77980500B50D50 /* Security.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Security.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                DC1789121D7798B300B50D50 /* libDiagnosticMessagesClient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libDiagnosticMessagesClient.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libDiagnosticMessagesClient.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libOpenScriptingUtil.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libOpenScriptingUtil.dylib; sourceTree = DEVELOPER_DIR; };

-               DC1789161D77998700B50D50 /* libauto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libauto.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libauto.dylib; sourceTree = DEVELOPER_DIR; };

                DC1789181D77998C00B50D50 /* libbsm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbsm.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libbsm.dylib; sourceTree = DEVELOPER_DIR; };
                DC17891C1D77999700B50D50 /* libpam.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpam.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libpam.dylib; sourceTree = DEVELOPER_DIR; };
                DC17891E1D77999D00B50D50 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789181D77998C00B50D50 /* libbsm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbsm.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libbsm.dylib; sourceTree = DEVELOPER_DIR; };
                DC17891C1D77999700B50D50 /* libpam.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpam.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libpam.dylib; sourceTree = DEVELOPER_DIR; };
                DC17891E1D77999D00B50D50 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };


@@ -11138,7 +13598,6 @@
                DC1789221D7799A600B50D50 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789241D7799CD00B50D50 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
                DC1789261D7799D300B50D50 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; };
                DC1789221D7799A600B50D50 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
                DC1789241D7799CD00B50D50 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = DEVELOPER_DIR; };
                DC1789261D7799D300B50D50 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; };

-               DC1789A01D779DEE00B50D50 /* SecBreadcrumb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SecBreadcrumb.c; path = OSX/Breadcrumb/SecBreadcrumb.c; sourceTree = "<group>"; };

                DC1789A41D779E3B00B50D50 /* dummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dummy.cpp; path = OSX/lib/dummy.cpp; sourceTree = "<group>"; };
                DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = cssm.mdsinfo; path = OSX/libsecurity_cssm/mds/cssm.mdsinfo; sourceTree = "<group>"; };
                DC178A0F1D77A1E700B50D50 /* csp_capabilities.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = csp_capabilities.mdsinfo; path = OSX/libsecurity_apple_csp/mds/csp_capabilities.mdsinfo; sourceTree = "<group>"; };
                DC1789A41D779E3B00B50D50 /* dummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dummy.cpp; path = OSX/lib/dummy.cpp; sourceTree = "<group>"; };
                DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = cssm.mdsinfo; path = OSX/libsecurity_cssm/mds/cssm.mdsinfo; sourceTree = "<group>"; };
                DC178A0F1D77A1E700B50D50 /* csp_capabilities.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = csp_capabilities.mdsinfo; path = OSX/libsecurity_apple_csp/mds/csp_capabilities.mdsinfo; sourceTree = "<group>"; };


@@ -11158,26 +13617,30 @@
                DC178A1D1D77A1E700B50D50 /* tp_primary.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = tp_primary.mdsinfo; path = OSX/libsecurity_apple_x509_tp/mds/tp_primary.mdsinfo; sourceTree = "<group>"; };
                DC178A1E1D77A1E700B50D50 /* sd_cspdl_common.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = sd_cspdl_common.mdsinfo; path = OSX/libsecurity_sd_cspdl/mds/sd_cspdl_common.mdsinfo; sourceTree = "<group>"; };
                DC178A311D77A1F500B50D50 /* FDEPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = FDEPrefs.plist; path = OSX/lib/FDEPrefs.plist; sourceTree = "<group>"; };
                DC178A1D1D77A1E700B50D50 /* tp_primary.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = tp_primary.mdsinfo; path = OSX/libsecurity_apple_x509_tp/mds/tp_primary.mdsinfo; sourceTree = "<group>"; };
                DC178A1E1D77A1E700B50D50 /* sd_cspdl_common.mdsinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = sd_cspdl_common.mdsinfo; path = OSX/libsecurity_sd_cspdl/mds/sd_cspdl_common.mdsinfo; sourceTree = "<group>"; };
                DC178A311D77A1F500B50D50 /* FDEPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = FDEPrefs.plist; path = OSX/lib/FDEPrefs.plist; sourceTree = "<group>"; };

-               DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = SecDebugErrorMessages.strings; path = derived_src/SecDebugErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC178A341D77A1F500B50D50 /* SecErrorMessages.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = SecErrorMessages.strings; path = derived_src/en.lproj/SecErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC178A351D77A1F500B50D50 /* framework.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = framework.sb; path = OSX/lib/framework.sb; sourceTree = "<group>"; };
+               DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 10; name = SecDebugErrorMessages.strings; path = derived_src/SecDebugErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC178A341D77A1F500B50D50 /* SecErrorMessages.strings */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 10; name = SecErrorMessages.strings; path = derived_src/en.lproj/SecErrorMessages.strings; sourceTree = BUILT_PRODUCTS_DIR; };

                DC178A391D77A1F500B50D50 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = TimeStampingPrefs.plist; path = OSX/lib/TimeStampingPrefs.plist; sourceTree = "<group>"; };
                DC178A391D77A1F500B50D50 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = TimeStampingPrefs.plist; path = OSX/lib/TimeStampingPrefs.plist; sourceTree = "<group>"; };

-               DC178A3C1D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = "OSX/lib/en.lproj/authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings"; sourceTree = "<group>"; };
+               DC178A3C1D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/authorization.dfr.prompts.strings; sourceTree = "<group>"; };

                DC178A3E1D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/authorization.buttons.strings; sourceTree = "<group>"; };
                DC178A401D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/authorization.prompts.strings; sourceTree = "<group>"; };
                DC178BB11D77A5F500B50D50 /* security_framework_macos.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = security_framework_macos.xcconfig; path = OSX/config/security_framework_macos.xcconfig; sourceTree = "<group>"; };
                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSFetchAllRecordZoneChangesOperation.h; sourceTree = "<group>"; };
                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSFetchAllRecordZoneChangesOperation.m; sourceTree = "<group>"; };
                DC178A3E1D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/authorization.buttons.strings; sourceTree = "<group>"; };
                DC178A401D77A1F500B50D50 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = OSX/lib/en.lproj/authorization.prompts.strings; sourceTree = "<group>"; };
                DC178BB11D77A5F500B50D50 /* security_framework_macos.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = security_framework_macos.xcconfig; path = OSX/config/security_framework_macos.xcconfig; sourceTree = "<group>"; };
                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSFetchAllRecordZoneChangesOperation.h; sourceTree = "<group>"; };
                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSFetchAllRecordZoneChangesOperation.m; sourceTree = "<group>"; };

+               DC19484A21812EC5007C2260 /* OTDeviceInformationAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTDeviceInformationAdapter.h; sourceTree = "<group>"; };
+               DC19484B21812EC5007C2260 /* OTDeviceInformationAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTDeviceInformationAdapter.m; sourceTree = "<group>"; };

                DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSScanLocalItemsOperation.h; sourceTree = "<group>"; };
                DC1DA6671E4555D80094CE7F /* CKKSScanLocalItemsOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSScanLocalItemsOperation.m; sourceTree = "<group>"; };
                DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSScanLocalItemsOperation.h; sourceTree = "<group>"; };
                DC1DA6671E4555D80094CE7F /* CKKSScanLocalItemsOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSScanLocalItemsOperation.m; sourceTree = "<group>"; };

+               DC1E5AB423063A4D00918162 /* CKKSPeerProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSPeerProvider.h; sourceTree = "<group>"; };
+               DC1E5AB523063A4E00918162 /* CKKSPeerProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSPeerProvider.m; sourceTree = "<group>"; };

                DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSItemEncrypter.m; sourceTree = "<group>"; };
                DC1ED8C01DD51890002BDCFA /* CKKSItemEncrypter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSItemEncrypter.h; sourceTree = "<group>"; };
                DC1ED8C21DD5538C002BDCFA /* CKKS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKS.h; sourceTree = "<group>"; };
                DC1ED8C51DD55476002BDCFA /* CKKS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKS.m; sourceTree = "<group>"; };
                DC207EB61ED4EAB600D46873 /* CKKSLockStateTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSLockStateTracker.h; sourceTree = "<group>"; };
                DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLockStateTracker.m; sourceTree = "<group>"; };
                DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSItemEncrypter.m; sourceTree = "<group>"; };
                DC1ED8C01DD51890002BDCFA /* CKKSItemEncrypter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSItemEncrypter.h; sourceTree = "<group>"; };
                DC1ED8C21DD5538C002BDCFA /* CKKS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKS.h; sourceTree = "<group>"; };
                DC1ED8C51DD55476002BDCFA /* CKKS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKS.m; sourceTree = "<group>"; };
                DC207EB61ED4EAB600D46873 /* CKKSLockStateTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSLockStateTracker.h; sourceTree = "<group>"; };
                DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLockStateTracker.m; sourceTree = "<group>"; };

-               DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_ios_NO_AKS.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC221BA92267E2A60068DBCF /* OTUpdateTPHOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTUpdateTPHOperation.h; sourceTree = "<group>"; };
+               DC221BAA2267E2A60068DBCF /* OTUpdateTPHOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTUpdateTPHOperation.m; sourceTree = "<group>"; };

                DC222C891E089BAE00B09171 /* CKKSSQLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSQLTests.m; sourceTree = "<group>"; };
                DC222CA61E08A7D900B09171 /* CloudKitMockXCTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudKitMockXCTest.h; sourceTree = "<group>"; };
                DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloudKitMockXCTest.m; sourceTree = "<group>"; };
                DC222C891E089BAE00B09171 /* CKKSSQLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSQLTests.m; sourceTree = "<group>"; };
                DC222CA61E08A7D900B09171 /* CloudKitMockXCTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudKitMockXCTest.h; sourceTree = "<group>"; };
                DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloudKitMockXCTest.m; sourceTree = "<group>"; };


@@ -11201,7 +13664,6 @@
                DC24B5681DA326B900330B48 /* rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rule.h; path = OSX/authd/rule.h; sourceTree = "<group>"; };
                DC24B5691DA326B900330B48 /* server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = server.h; path = OSX/authd/server.h; sourceTree = "<group>"; };
                DC24B56A1DA326B900330B48 /* session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = session.h; path = OSX/authd/session.h; sourceTree = "<group>"; };
                DC24B5681DA326B900330B48 /* rule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rule.h; path = OSX/authd/rule.h; sourceTree = "<group>"; };
                DC24B5691DA326B900330B48 /* server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = server.h; path = OSX/authd/server.h; sourceTree = "<group>"; };
                DC24B56A1DA326B900330B48 /* session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = session.h; path = OSX/authd/session.h; sourceTree = "<group>"; };

-               DC24B5701DA3274000330B48 /* breadcrumb_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = breadcrumb_regressions.h; path = OSX/Breadcrumb/breadcrumb_regressions.h; sourceTree = "<group>"; };

                DC24B5711DA327A800330B48 /* KDAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDAppDelegate.h; path = OSX/Keychain/KDAppDelegate.h; sourceTree = SOURCE_ROOT; };
                DC24B5721DA327A800330B48 /* KDCirclePeer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDCirclePeer.h; path = OSX/Keychain/KDCirclePeer.h; sourceTree = SOURCE_ROOT; };
                DC24B5731DA327A800330B48 /* KDSecCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDSecCircle.h; path = OSX/Keychain/KDSecCircle.h; sourceTree = SOURCE_ROOT; };
                DC24B5711DA327A800330B48 /* KDAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDAppDelegate.h; path = OSX/Keychain/KDAppDelegate.h; sourceTree = SOURCE_ROOT; };
                DC24B5721DA327A800330B48 /* KDCirclePeer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDCirclePeer.h; path = OSX/Keychain/KDCirclePeer.h; sourceTree = SOURCE_ROOT; };
                DC24B5731DA327A800330B48 /* KDSecCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KDSecCircle.h; path = OSX/Keychain/KDSecCircle.h; sourceTree = SOURCE_ROOT; };


@@ -11222,9 +13684,22 @@
                DC24B5821DA420D700330B48 /* SOSPersist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPersist.h; sourceTree = "<group>"; };
                DC24B5831DA422BE00330B48 /* base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = base.xcconfig; path = OSX/config/base.xcconfig; sourceTree = "<group>"; };
                DC24B5851DA432E900330B48 /* CloudKeychainProxy.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CloudKeychainProxy.8; path = OSX/sec/CloudKeychainProxy/CloudKeychainProxy.8; sourceTree = "<group>"; };
                DC24B5821DA420D700330B48 /* SOSPersist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPersist.h; sourceTree = "<group>"; };
                DC24B5831DA422BE00330B48 /* base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = base.xcconfig; path = OSX/config/base.xcconfig; sourceTree = "<group>"; };
                DC24B5851DA432E900330B48 /* CloudKeychainProxy.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CloudKeychainProxy.8; path = OSX/sec/CloudKeychainProxy/CloudKeychainProxy.8; sourceTree = "<group>"; };

+               DC26666821CAC32700F19960 /* OTControlCLI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTControlCLI.h; sourceTree = "<group>"; };
+               DC26666921CAC32700F19960 /* OTControlCLI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTControlCLI.m; sourceTree = "<group>"; };

                DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
                DC27B57D1DDFC24500599261 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };

+               DC27C3C020EAD9C300F7839C /* OctagonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonTests.swift; sourceTree = "<group>"; };
+               DC27C3C820EADD8200F7839C /* OctagonTests-BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OctagonTests-BridgingHeader.h"; sourceTree = "<group>"; };
+               DC2819B822F8F6FE007829F5 /* OctagonTests+DeviceList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+DeviceList.swift"; sourceTree = "<group>"; };
+               DC2B9A5023147A3800D4C79D /* TPMachineID.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPMachineID.h; sourceTree = "<group>"; };
+               DC2B9A5123147A3800D4C79D /* TPMachineID.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPMachineID.m; sourceTree = "<group>"; };

                DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSNotifier.h; sourceTree = "<group>"; };
                DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSNotifier.m; sourceTree = "<group>"; };
                DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSNotifier.h; sourceTree = "<group>"; };
                DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSNotifier.m; sourceTree = "<group>"; };

+               DC311E772124B8A8002F5EAE /* libaks_real_witness.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libaks_real_witness.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC311E782124B8EF002F5EAE /* aks_real_witness.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = aks_real_witness.h; sourceTree = "<group>"; };
+               DC311E792124B8EF002F5EAE /* aks_real_witness.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = aks_real_witness.c; sourceTree = "<group>"; };
+               DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = swift_binary.xcconfig; path = xcconfig/swift_binary.xcconfig; sourceTree = "<group>"; };
+               DC3412E5245780B9008ABD0A /* CKKSOperationDependencies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSOperationDependencies.h; sourceTree = "<group>"; };
+               DC3412E6245780BA008ABD0A /* CKKSOperationDependencies.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSOperationDependencies.m; sourceTree = "<group>"; };

                DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CKKSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                DC3502B71E0208BE00BC0587 /* CKKSTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTests.m; sourceTree = "<group>"; };
                DC3502B91E0208BE00BC0587 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CKKSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                DC3502B71E0208BE00BC0587 /* CKKSTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTests.m; sourceTree = "<group>"; };
                DC3502B91E0208BE00BC0587 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };


@@ -11232,33 +13707,49 @@
                DC3502E51E0214C800BC0587 /* MockCloudKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockCloudKit.h; sourceTree = "<group>"; };
                DC3502E61E0214C800BC0587 /* MockCloudKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MockCloudKit.m; sourceTree = "<group>"; };
                DC3502E81E02172C00BC0587 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../../AppleInternal/Library/Frameworks/OCMock.framework; sourceTree = SDKROOT; };
                DC3502E51E0214C800BC0587 /* MockCloudKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockCloudKit.h; sourceTree = "<group>"; };
                DC3502E61E0214C800BC0587 /* MockCloudKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MockCloudKit.m; sourceTree = "<group>"; };
                DC3502E81E02172C00BC0587 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = ../../AppleInternal/Library/Frameworks/OCMock.framework; sourceTree = SDKROOT; };

+               DC36895E21235F42003A3735 /* libaks_mock.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libaks_mock.a; sourceTree = BUILT_PRODUCTS_DIR; };

                DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSMirrorEntry.h; sourceTree = "<group>"; };
                DC378B2E1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSMirrorEntry.m; sourceTree = "<group>"; };
                DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSZoneStateEntry.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>"; };
                DC378B2C1DEF9DF000A3DAFA /* CKKSMirrorEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSMirrorEntry.h; sourceTree = "<group>"; };
                DC378B2E1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSMirrorEntry.m; sourceTree = "<group>"; };
                DC378B361DEFADB500A3DAFA /* CKKSZoneStateEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSZoneStateEntry.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>"; };

+               DC391F9921BF2F4B00772585 /* CKKSConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSConstants.m; sourceTree = "<group>"; };
+               DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonPeerKeys.swift; 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>"; usesTabs = 1; };
                DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcoretls_cfhelpers.dylib; path = usr/lib/libcoretls_cfhelpers.dylib; sourceTree = SDKROOT; };
                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>"; usesTabs = 1; };
                DC3A81D41D99D567000C7419 /* libcoretls_cfhelpers.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcoretls_cfhelpers.dylib; path = usr/lib/libcoretls_cfhelpers.dylib; sourceTree = SDKROOT; };

+               DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_BottledPeers.swift; sourceTree = "<group>"; };
+               DC3AA27C2097DF94007CA68A /* security_tool_commands_table.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = security_tool_commands_table.h; sourceTree = "<group>"; };
+               DC3AF52A2229E6C0006577E8 /* CKKSListenerCollection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSListenerCollection.h; sourceTree = "<group>"; };
+               DC3AF52B2229E6C0006577E8 /* CKKSListenerCollection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSListenerCollection.m; sourceTree = "<group>"; };
+               DC3B222C22C408BE006D915C /* TrustedPeersHelper_2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrustedPeersHelper_2.xcdatamodel; sourceTree = "<group>"; };

                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>"; };
                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>"; };
+               DC4269061E82FBDF002B7110 /* server_security_helpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = server_security_helpers.m; sourceTree = "<group>"; };

                DC4269071E82FBDF002B7110 /* server_security_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_security_helpers.h; sourceTree = "<group>"; };
                DC4269071E82FBDF002B7110 /* server_security_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_security_helpers.h; sourceTree = "<group>"; };

+               DC4415B323610BF40087981C /* OctagonTests+Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+Account.swift"; sourceTree = "<group>"; };
+               DC45D43B22EB619D00CEB6B7 /* OctagonStateMachineObservers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonStateMachineObservers.h; sourceTree = "<group>"; };
+               DC45D43C22EB619D00CEB6B7 /* OctagonStateMachineObservers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonStateMachineObservers.m; sourceTree = "<group>"; };
+               DC4A76A2221267D4006F2D8F /* EscrowRequestServerHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestServerHelpers.m; sourceTree = "<group>"; };
+               DC4A76A4221267FB006F2D8F /* EscrowRequestServerHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestServerHelpers.h; sourceTree = "<group>"; };
+               DC4A76A92212698B006F2D8F /* CloudServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/CloudServices.framework; sourceTree = DEVELOPER_DIR; };
+               DC4CD9822372294D00EF55FC /* OctagonTests+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OctagonTests+Helpers.swift"; 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 /* CKKSAESSIVEncryptionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSAESSIVEncryptionTests.m; 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 /* CKKSAESSIVEncryptionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSAESSIVEncryptionTests.m; sourceTree = "<group>"; };

+               DC5060E920E2D88300925005 /* OTCuttlefishContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTCuttlefishContext.h; sourceTree = "<group>"; };
+               DC5060EA20E2D88300925005 /* OTCuttlefishContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTCuttlefishContext.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; };
                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; };

-               DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecurityTool.a; sourceTree = BUILT_PRODUCTS_DIR; };

                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = builtin_commands.h; sourceTree = "<group>"; };
                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = digest_calc.c; sourceTree = "<group>"; };
                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = builtin_commands.h; sourceTree = "<group>"; };
                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = digest_calc.c; sourceTree = "<group>"; };

-               DC52EA901D80CC2A00B0A59C /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = entitlements.plist; path = OSX/sec/SecurityTool/entitlements.plist; sourceTree = SOURCE_ROOT; };
+               DC52EA901D80CC2A00B0A59C /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };

                DC52EA911D80CC2A00B0A59C /* whoami.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = whoami.m; sourceTree = "<group>"; };
                DC52EA921D80CC2A00B0A59C /* syncbubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = syncbubble.m; sourceTree = "<group>"; };
                DC52EA931D80CC2A00B0A59C /* leaks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = leaks.c; sourceTree = "<group>"; };
                DC52EA911D80CC2A00B0A59C /* whoami.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = whoami.m; sourceTree = "<group>"; };
                DC52EA921D80CC2A00B0A59C /* syncbubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = syncbubble.m; sourceTree = "<group>"; };
                DC52EA931D80CC2A00B0A59C /* leaks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = leaks.c; sourceTree = "<group>"; };


@@ -11269,7 +13760,6 @@
                DC52EA981D80CC2A00B0A59C /* SecurityTool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecurityTool.c; sourceTree = "<group>"; };
                DC52EA991D80CC2A00B0A59C /* SecurityTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityTool.h; sourceTree = "<group>"; };
                DC52EA9A1D80CC2A00B0A59C /* tool_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tool_errors.h; sourceTree = "<group>"; };
                DC52EA981D80CC2A00B0A59C /* SecurityTool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecurityTool.c; sourceTree = "<group>"; };
                DC52EA991D80CC2A00B0A59C /* SecurityTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityTool.h; sourceTree = "<group>"; };
                DC52EA9A1D80CC2A00B0A59C /* tool_errors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tool_errors.h; sourceTree = "<group>"; };

-               DC52EBD51D80CEF100B0A59C /* libSecurityCommands.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecurityCommands.a; sourceTree = BUILT_PRODUCTS_DIR; };

                DC52EC341D80CFB200B0A59C /* libSOSCommands.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSOSCommands.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSWCAgent.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EC5C1D80D05200B0A59C /* liblogging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liblogging.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EC341D80CFB200B0A59C /* libSOSCommands.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSOSCommands.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSWCAgent.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EC5C1D80D05200B0A59C /* liblogging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liblogging.a; sourceTree = BUILT_PRODUCTS_DIR; };


@@ -11280,12 +13770,16 @@
                DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsecdRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EE411D80D6DD00B0A59C /* libSharedRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSharedRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EE6E1D80D82600B0A59C /* libSecItemShimOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecItemShimOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EDB11D80D58400B0A59C /* libsecdRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsecdRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EE411D80D6DD00B0A59C /* libSharedRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSharedRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC52EE6E1D80D82600B0A59C /* libSecItemShimOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecItemShimOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };

+               DC5681A8224DA05F008F8DEB /* OctagonFlags.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonFlags.h; sourceTree = "<group>"; };
+               DC5681A9224DA05F008F8DEB /* OctagonFlags.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonFlags.m; sourceTree = "<group>"; };

                DC58C4231D77BDEA003C25A4 /* csparser.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = csparser.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                DC58C43A1D77BED0003C25A4 /* csparser-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "csparser-Info.plist"; path = "OSX/lib/plugins/csparser-Info.plist"; sourceTree = "<group>"; };
                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>"; };
                DC59EA731D91CBD0001BDDF5 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
                DC58C4231D77BDEA003C25A4 /* csparser.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = csparser.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
                DC58C43A1D77BED0003C25A4 /* csparser-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "csparser-Info.plist"; path = "OSX/lib/plugins/csparser-Info.plist"; sourceTree = "<group>"; };
                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>"; };
                DC59EA731D91CBD0001BDDF5 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };

+               DC5A01E621BB428500D87AB9 /* CKKSTLKShare.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSTLKShare.h; sourceTree = "<group>"; };
+               DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKShare.m; sourceTree = "<group>"; };

                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>"; };
                DC5ABD7A1D832D5800CF422C /* createFVMaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = createFVMaster.c; sourceTree = "<group>"; };
                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>"; };
                DC5ABD7A1D832D5800CF422C /* createFVMaster.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = createFVMaster.c; sourceTree = "<group>"; };


@@ -11418,8 +13912,6 @@
                DC5ABFBE1D83511A00CF422C /* clientid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = clientid.cpp; sourceTree = "<group>"; };
                DC5ABFBF1D83511A00CF422C /* codesigdb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = codesigdb.h; sourceTree = "<group>"; };
                DC5ABFC01D83511A00CF422C /* codesigdb.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = codesigdb.cpp; sourceTree = "<group>"; };
                DC5ABFBE1D83511A00CF422C /* clientid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = clientid.cpp; sourceTree = "<group>"; };
                DC5ABFBF1D83511A00CF422C /* codesigdb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = codesigdb.h; sourceTree = "<group>"; };
                DC5ABFC01D83511A00CF422C /* codesigdb.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = codesigdb.cpp; sourceTree = "<group>"; };

-               DC5ABFC21D83511A00CF422C /* csproxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = csproxy.h; sourceTree = "<group>"; };
-               DC5ABFC31D83511A00CF422C /* csproxy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = csproxy.cpp; sourceTree = "<group>"; };

                DC5ABFC51D83511A00CF422C /* agentclient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = agentclient.h; sourceTree = "<group>"; };
                DC5ABFC61D83511A00CF422C /* agentquery.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = agentquery.h; sourceTree = "<group>"; };
                DC5ABFC71D83511A00CF422C /* agentquery.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = agentquery.cpp; sourceTree = "<group>"; };
                DC5ABFC51D83511A00CF422C /* agentclient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = agentclient.h; sourceTree = "<group>"; };
                DC5ABFC61D83511A00CF422C /* agentquery.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = agentquery.h; sourceTree = "<group>"; };
                DC5ABFC71D83511A00CF422C /* agentquery.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = agentquery.cpp; sourceTree = "<group>"; };


@@ -11456,8 +13948,13 @@
                DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSOutgoingQueueOperation.m; sourceTree = "<group>"; };
                DC5BCC461E5380EA00649140 /* SecArgParse.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = SecArgParse.c; path = lib/SecArgParse.c; sourceTree = "<group>"; };
                DC5BCC471E5380EA00649140 /* SecArgParse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecArgParse.h; path = lib/SecArgParse.h; sourceTree = "<group>"; };
                DC5BB4FD1E0C98320010F836 /* CKKSOutgoingQueueOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSOutgoingQueueOperation.m; sourceTree = "<group>"; };
                DC5BCC461E5380EA00649140 /* SecArgParse.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = SecArgParse.c; path = lib/SecArgParse.c; sourceTree = "<group>"; };
                DC5BCC471E5380EA00649140 /* SecArgParse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecArgParse.h; path = lib/SecArgParse.h; sourceTree = "<group>"; };

+               DC5BEACC2217509A001681F0 /* OctagonTests+CloudKitAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+CloudKitAccount.swift"; sourceTree = "<group>"; };
+               DC5F2BBD2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+CoreFollowUp.swift"; sourceTree = "<group>"; };

                DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = server_entitlement_helpers.c; sourceTree = "<group>"; };
                DC5F35A51EE0F1A900900966 /* server_entitlement_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_entitlement_helpers.h; sourceTree = "<group>"; };
                DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = server_entitlement_helpers.c; sourceTree = "<group>"; };
                DC5F35A51EE0F1A900900966 /* server_entitlement_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = server_entitlement_helpers.h; sourceTree = "<group>"; };

+               DC5F65AC2225C22C0051E9FA /* CKKSProvideKeySetOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSProvideKeySetOperation.h; sourceTree = "<group>"; };
+               DC5F65AD2225C22C0051E9FA /* CKKSProvideKeySetOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSProvideKeySetOperation.m; sourceTree = "<group>"; };
+               DC6063B121B09AB200069B82 /* KCJoiningRequestCircleSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KCJoiningRequestCircleSession.m; sourceTree = "<group>"; };

                DC610A341D78F129002223DE /* secdtests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secdtests; sourceTree = BUILT_PRODUCTS_DIR; };
                DC610A3A1D78F228002223DE /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = usr/local/lib/libACM.a; sourceTree = SDKROOT; };
                DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libDiagnosticMessagesClient.dylib; path = usr/lib/libDiagnosticMessagesClient.dylib; sourceTree = SDKROOT; };
                DC610A341D78F129002223DE /* secdtests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secdtests; sourceTree = BUILT_PRODUCTS_DIR; };
                DC610A3A1D78F228002223DE /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = usr/local/lib/libACM.a; sourceTree = SDKROOT; };
                DC610A3C1D78F25C002223DE /* libDiagnosticMessagesClient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libDiagnosticMessagesClient.dylib; path = usr/lib/libDiagnosticMessagesClient.dylib; sourceTree = SDKROOT; };


@@ -11472,8 +13969,11 @@
                DC610A681D78FA87002223DE /* validation.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = validation.sh; path = OSX/codesign_tests/validation.sh; sourceTree = "<group>"; };
                DC610AB71D7910C3002223DE /* gk_reset_check */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gk_reset_check; sourceTree = BUILT_PRODUCTS_DIR; };
                DC610AB91D7910F8002223DE /* gk_reset_check.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gk_reset_check.c; path = OSX/gk_reset_check/gk_reset_check.c; sourceTree = "<group>"; };
                DC610A681D78FA87002223DE /* validation.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = validation.sh; path = OSX/codesign_tests/validation.sh; sourceTree = "<group>"; };
                DC610AB71D7910C3002223DE /* gk_reset_check */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = gk_reset_check; sourceTree = BUILT_PRODUCTS_DIR; };
                DC610AB91D7910F8002223DE /* gk_reset_check.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gk_reset_check.c; path = OSX/gk_reset_check/gk_reset_check.c; sourceTree = "<group>"; };

+               DC614C4F22A9BDB500E16ADA /* CKKSZoneModifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSZoneModifier.h; sourceTree = "<group>"; };
+               DC614C5022A9BDB500E16ADA /* CKKSZoneModifier.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSZoneModifier.m; sourceTree = "<group>"; };
+               DC62DC6B22A87128000D2D5D /* CKKSTests+MultiZone.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+MultiZone.m"; sourceTree = "<group>"; };
+               DC62DC6E22A8721C000D2D5D /* CKKSTests+MultiZone.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CKKSTests+MultiZone.h"; sourceTree = "<group>"; };

                DC63D70220B3930700D088AD /* libxar.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxar.tbd; path = usr/lib/libxar.tbd; sourceTree = SDKROOT; };
                DC63D70220B3930700D088AD /* libxar.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxar.tbd; path = usr/lib/libxar.tbd; sourceTree = SDKROOT; };

-               DC63D70920B3933000D088AD /* libOpenScriptingUtil.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libOpenScriptingUtil.tbd; path = usr/lib/libOpenScriptingUtil.tbd; sourceTree = SDKROOT; };

                DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+CurrentPointerAPI.m"; sourceTree = "<group>"; };
                DC6593D21ED8DBCE00C19462 /* CKKSTests+API.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CKKSTests+API.h"; sourceTree = "<group>"; };
                DC65E7BE1D8CBB1500152EF0 /* readline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = readline.c; sourceTree = "<group>"; };
                DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+CurrentPointerAPI.m"; sourceTree = "<group>"; };
                DC6593D21ED8DBCE00C19462 /* CKKSTests+API.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CKKSTests+API.h"; sourceTree = "<group>"; };
                DC65E7BE1D8CBB1500152EF0 /* readline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = readline.c; sourceTree = "<group>"; };


@@ -11512,7 +14012,6 @@
                DC6A82771D87733C00418608 /* ss_types.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ss_types.defs; sourceTree = "<group>"; };
                DC6A82781D87733C00418608 /* ucsp.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ucsp.defs; sourceTree = "<group>"; };
                DC6A82791D87733C00418608 /* ucspNotify.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ucspNotify.defs; sourceTree = "<group>"; };
                DC6A82771D87733C00418608 /* ss_types.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ss_types.defs; sourceTree = "<group>"; };
                DC6A82781D87733C00418608 /* ucsp.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ucsp.defs; sourceTree = "<group>"; };
                DC6A82791D87733C00418608 /* ucspNotify.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = ucspNotify.defs; sourceTree = "<group>"; };

-               DC6A827A1D87733C00418608 /* cshosting.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = cshosting.defs; sourceTree = "<group>"; };

                DC6A827D1D87734600418608 /* ucsp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucsp.h; path = derived_src/securityd_client/ucsp.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A827E1D87734600418608 /* ucspNotify.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucspNotify.h; path = derived_src/securityd_client/ucspNotify.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A827F1D87734600418608 /* ucspClient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspClient.cpp; path = derived_src/securityd_client/ucspClient.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A827D1D87734600418608 /* ucsp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucsp.h; path = derived_src/securityd_client/ucsp.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A827E1D87734600418608 /* ucspNotify.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucspNotify.h; path = derived_src/securityd_client/ucspNotify.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A827F1D87734600418608 /* ucspClient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspClient.cpp; path = derived_src/securityd_client/ucspClient.cpp; sourceTree = BUILT_PRODUCTS_DIR; };


@@ -11520,24 +14019,52 @@
                DC6A82811D87734600418608 /* ucspServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspServer.cpp; path = derived_src/securityd_client/ucspServer.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A82821D87734600418608 /* ucspNotifySender.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspNotifySender.cpp; path = derived_src/securityd_client/ucspNotifySender.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A82831D87734600418608 /* ucspNotifyReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspNotifyReceiver.cpp; path = derived_src/securityd_client/ucspNotifyReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A82811D87734600418608 /* ucspServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspServer.cpp; path = derived_src/securityd_client/ucspServer.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A82821D87734600418608 /* ucspNotifySender.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspNotifySender.cpp; path = derived_src/securityd_client/ucspNotifySender.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6A82831D87734600418608 /* ucspNotifyReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ucspNotifyReceiver.cpp; path = derived_src/securityd_client/ucspNotifyReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };

-               DC6A82841D87734600418608 /* cshosting.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cshosting.h; path = derived_src/securityd_client/cshosting.h; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC6A82851D87734600418608 /* cshostingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = cshostingClient.cpp; path = derived_src/securityd_client/cshostingClient.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
-               DC6A82861D87734600418608 /* cshostingServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = cshostingServer.cpp; path = derived_src/securityd_client/cshostingServer.cpp; sourceTree = BUILT_PRODUCTS_DIR; };

                DC6A82921D87749900418608 /* libsecurityd_client.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_client.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6ACC401E81DF9400125DC5 /* server_endpoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = server_endpoint.m; sourceTree = "<group>"; };
                DC6A82921D87749900418608 /* libsecurityd_client.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurityd_client.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DC6ACC401E81DF9400125DC5 /* server_endpoint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = server_endpoint.m; sourceTree = "<group>"; };

+               DC6DE897213076C000C6B56D /* OTSOSUpgradeOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSOSUpgradeOperation.h; sourceTree = "<group>"; };
+               DC6DE898213076C000C6B56D /* OTSOSUpgradeOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSOSUpgradeOperation.m; sourceTree = "<group>"; };
+               DC6E02122405DDC300C61335 /* OTModifyUserControllableViewStatusOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTModifyUserControllableViewStatusOperation.h; sourceTree = "<group>"; };
+               DC6E02132405DDC400C61335 /* OTModifyUserControllableViewStatusOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTModifyUserControllableViewStatusOperation.m; sourceTree = "<group>"; };
+               DC7181062089172F00B2CB13 /* TrustedPeersHelper-entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TrustedPeersHelper-entitlements.plist"; 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>"; };
                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; };
-               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>"; };
+               DC72502D229600A800493D88 /* OctagonTests+Reset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+Reset.swift"; sourceTree = "<group>"; };
+               DC7250352296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTResetCKKSZonesLackingTLKsOperation.h; sourceTree = "<group>"; };
+               DC7250362296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTResetCKKSZonesLackingTLKsOperation.m; sourceTree = "<group>"; };
+               DC730E15224011D60051DD48 /* TPPBDictionaryMatchingRule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDictionaryMatchingRule.m; sourceTree = "<group>"; };
+               DC730E16224011D70051DD48 /* TPPBDictionaryMatchingRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDictionaryMatchingRule.h; sourceTree = "<group>"; };
+               DC730E17224011D80051DD48 /* TPPBDictionaryMatchingRuleFieldExists.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDictionaryMatchingRuleFieldExists.m; sourceTree = "<group>"; };
+               DC730E18224011D90051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDictionaryMatchingRuleFieldRegexMatch.h; sourceTree = "<group>"; };
+               DC730E19224011DB0051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDictionaryMatchingRuleFieldRegexMatch.m; sourceTree = "<group>"; };
+               DC730E1A224011DD0051DD48 /* TPPBDictionaryMatchingRuleFieldExists.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDictionaryMatchingRuleFieldExists.h; sourceTree = "<group>"; };
+               DC7341F11F8447AB00AB9BDF /* CKKSTLKShareRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSTLKShareRecord.h; sourceTree = "<group>"; };
+               DC7341F21F8447AB00AB9BDF /* CKKSTLKShareRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKShareRecord.m; sourceTree = "<group>"; };

                DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKSharingEncryptionTests.m; sourceTree = "<group>"; };
                DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSTLKSharingEncryptionTests.m; sourceTree = "<group>"; };

+               DC751A0C211E02B100C18042 /* OTAccountMetadataClassC.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = OTAccountMetadataClassC.proto; sourceTree = "<group>"; };
+               DC754C712228B57B00A39C8E /* TrustedPeersHelperProtocol.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TrustedPeersHelperProtocol.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>"; };
                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>"; };

+               DC79572C21EEB62400761E21 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };

                DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSSQLDatabaseObject.m; sourceTree = "<group>"; };
                DC797E191DD3F89E00CC9E42 /* CKKSSQLDatabaseObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSSQLDatabaseObject.h; sourceTree = "<group>"; };
                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSProcessReceivedKeysOperation.h; sourceTree = "<group>"; };
                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSProcessReceivedKeysOperation.m; sourceTree = "<group>"; };
                DC797E131DD3F88300CC9E42 /* CKKSSQLDatabaseObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSSQLDatabaseObject.m; sourceTree = "<group>"; };
                DC797E191DD3F89E00CC9E42 /* CKKSSQLDatabaseObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSSQLDatabaseObject.h; sourceTree = "<group>"; };
                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSProcessReceivedKeysOperation.h; sourceTree = "<group>"; };
                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSProcessReceivedKeysOperation.m; sourceTree = "<group>"; };

+               DC7EB920211E17E500516452 /* OTAccountMetadataClassC+KeychainSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OTAccountMetadataClassC+KeychainSupport.h"; sourceTree = "<group>"; };
+               DC7EB921211E17E500516452 /* OTAccountMetadataClassC+KeychainSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OTAccountMetadataClassC+KeychainSupport.m"; sourceTree = "<group>"; };
+               DC7EB928211E20DF00516452 /* OctagonDataPersistenceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonDataPersistenceTests.swift; sourceTree = "<group>"; };
+               DC7F6A7C233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+ForwardCompatibility.swift"; sourceTree = "<group>"; };
+               DC7F79B522EA4ED4001FB69A /* OctagonTests+CKKS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+CKKS.swift"; sourceTree = "<group>"; };
+               DC7F79B822EA5C72001FB69A /* OTLocalCKKSResetOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTLocalCKKSResetOperation.h; sourceTree = "<group>"; };
+               DC7F79B922EA5C72001FB69A /* OTLocalCKKSResetOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTLocalCKKSResetOperation.m; sourceTree = "<group>"; };
+               DC7FC44321EE6F7B003C39B8 /* Security.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Security.plist; sourceTree = "<group>"; };
+               DC7FC44821EE914C003C39B8 /* FeatureFlagsPlist.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FeatureFlagsPlist.bundle; sourceTree = BUILT_PRODUCTS_DIR; };

                DC844AEC1E81F315007AAB71 /* client_endpoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = client_endpoint.m; sourceTree = "<group>"; };
                DC844AEC1E81F315007AAB71 /* client_endpoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = client_endpoint.m; sourceTree = "<group>"; };

-               DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASN1_not_installed.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC85687C2284E7850088D3EF /* OctagonTestMocks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OctagonTestMocks.swift; sourceTree = "<group>"; };
+               DC85687F2284E79C0088D3EF /* OctagonEscrowRecoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonEscrowRecoverer.h; sourceTree = "<group>"; };
+               DC86122B2408AC190092E93B /* CKKSTests+ItemSyncChoice.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+ItemSyncChoice.m"; sourceTree = "<group>"; };
+               DC8757F2218D2003000E65F1 /* OTRemovePeersOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTRemovePeersOperation.h; sourceTree = "<group>"; };
+               DC8757F3218D2003000E65F1 /* OTRemovePeersOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTRemovePeersOperation.m; sourceTree = "<group>"; };
+               DC880F67243D4CC00059806D /* CKKSLogging.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLogging.m; sourceTree = "<group>"; };
+               DC8834081D8A218F00CE0ACA /* libASN1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASN1.a; sourceTree = BUILT_PRODUCTS_DIR; };

                DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAsn1Coder.c; sourceTree = "<group>"; };
                DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAsn1Templates.c; sourceTree = "<group>"; };
                DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = certExtensionTemplates.c; sourceTree = "<group>"; };
                DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAsn1Coder.c; sourceTree = "<group>"; };
                DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAsn1Templates.c; sourceTree = "<group>"; };
                DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = certExtensionTemplates.c; sourceTree = "<group>"; };


@@ -11594,20 +14121,39 @@
                DC88344B1D8A21AA00CE0ACA /* oidsattr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oidsattr.c; sourceTree = "<group>"; };
                DC88344E1D8A21AA00CE0ACA /* oidsocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oidsocsp.c; sourceTree = "<group>"; };
                DC88344F1D8A21AA00CE0ACA /* oidsocsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = oidsocsp.h; sourceTree = "<group>"; };
                DC88344B1D8A21AA00CE0ACA /* oidsattr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oidsattr.c; sourceTree = "<group>"; };
                DC88344E1D8A21AA00CE0ACA /* oidsocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oidsocsp.c; sourceTree = "<group>"; };
                DC88344F1D8A21AA00CE0ACA /* oidsocsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = oidsocsp.h; sourceTree = "<group>"; };

+               DC88466922373A4000738068 /* TPPBDictionaryMatchingRule.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = TPPBDictionaryMatchingRule.proto; sourceTree = "<group>"; };
+               DC88466C2237407500738068 /* TPDictionaryMatchingRuleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPDictionaryMatchingRuleTests.m; sourceTree = "<group>"; };
+               DC88467F2237431400738068 /* TPDictionaryMatchingRules.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPDictionaryMatchingRules.h; sourceTree = "<group>"; };
+               DC8846802237431400738068 /* TPDictionaryMatchingRules.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPDictionaryMatchingRules.m; sourceTree = "<group>"; };
+               DC89608C2395C75500D339D9 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };

                DC8D238C2064649400E163C8 /* CKKSAPSHandlingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSAPSHandlingTests.m; sourceTree = "<group>"; };
                DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = lib_ios.xcconfig; path = xcconfig/lib_ios.xcconfig; sourceTree = "<group>"; };
                DC8D238C2064649400E163C8 /* CKKSAPSHandlingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSAPSHandlingTests.m; sourceTree = "<group>"; };
                DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = lib_ios.xcconfig; path = xcconfig/lib_ios.xcconfig; sourceTree = "<group>"; };

+               DC9061B822B02BA30071474D /* TPTypes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPTypes.m; sourceTree = "<group>"; };

                DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSZoneChangeFetcher.h; sourceTree = "<group>"; };
                DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSZoneChangeFetcher.m; sourceTree = "<group>"; };
                DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSZoneChangeFetcher.h; sourceTree = "<group>"; };
                DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSZoneChangeFetcher.m; sourceTree = "<group>"; };

+               DC90A4C021F27680001300EB /* SecEscrowRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecEscrowRequest.h; sourceTree = "<group>"; };
+               DC90A4C121F27680001300EB /* SecEscrowRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecEscrowRequest.m; sourceTree = "<group>"; };
+               DC90A4C621F279D4001300EB /* SecEscrowPendingRecord.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = SecEscrowPendingRecord.proto; sourceTree = "<group>"; };
+               DC93F02722387A010072720A /* OTSOSUpdatePreapprovalsOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSOSUpdatePreapprovalsOperation.h; sourceTree = "<group>"; };
+               DC93F02822387A010072720A /* OTSOSUpdatePreapprovalsOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSOSUpdatePreapprovalsOperation.m; sourceTree = "<group>"; };
+               DC947E812463831E005B8669 /* CKKSCheckKeyHierarchyOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSCheckKeyHierarchyOperation.h; sourceTree = "<group>"; };
+               DC947E832463831F005B8669 /* CKKSCheckKeyHierarchyOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSCheckKeyHierarchyOperation.m; sourceTree = "<group>"; };

                DC94BCC81F10448600E07CEB /* CloudKitCategories.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CloudKitCategories.h; sourceTree = "<group>"; };
                DC94BCC91F10448600E07CEB /* CloudKitCategories.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CloudKitCategories.m; sourceTree = "<group>"; };
                DC976C581E3AC5E50012A6DD /* PlatformFeatures.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = PlatformFeatures.xcconfig; path = xcconfig/PlatformFeatures.xcconfig; sourceTree = "<group>"; };
                DC94BCC81F10448600E07CEB /* CloudKitCategories.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CloudKitCategories.h; sourceTree = "<group>"; };
                DC94BCC91F10448600E07CEB /* CloudKitCategories.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CloudKitCategories.m; sourceTree = "<group>"; };
                DC976C581E3AC5E50012A6DD /* PlatformFeatures.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = PlatformFeatures.xcconfig; path = xcconfig/PlatformFeatures.xcconfig; sourceTree = "<group>"; };

+               DC9978B72404AA3200A5EE2F /* Container_UserSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_UserSync.swift; sourceTree = "<group>"; };
+               DC99B89220EACA470065B73B /* OctagonTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OctagonTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               DC99B89320EACA480065B73B /* OctagonTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OctagonTests-Info.plist"; sourceTree = "<group>"; };

                DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+Coalesce.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>"; };
                DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+Coalesce.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>"; };

+               DC9C06672149DFE400C6F7B8 /* OTAuthKitAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTAuthKitAdapter.h; sourceTree = "<group>"; };
+               DC9C06682149DFE400C6F7B8 /* OTAuthKitAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTAuthKitAdapter.m; 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>"; };
                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>"; };

+               DC9C98C622E264F30021E29F /* CKKSFetchTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSFetchTests.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; };
                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; };


@@ -11619,15 +14165,37 @@
                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>"; };
                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>"; };

+               DCA7F7EE23A44AA200927989 /* OctagonPolicyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonPolicyTests.swift; sourceTree = "<group>"; };
+               DCA9BC00221B721D00B4EB26 /* CKKSCloudKitClassDependencies.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCloudKitClassDependencies.h; sourceTree = "<group>"; };
+               DCA9BC01221B721E00B4EB26 /* CKKSCloudKitClassDependencies.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSCloudKitClassDependencies.m; sourceTree = "<group>"; };
+               DCA9BC05221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSMockSOSPresentAdapter.h; sourceTree = "<group>"; };
+               DCA9BC06221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSMockSOSPresentAdapter.m; sourceTree = "<group>"; };
+               DCA9D83B21FFDBA100B27421 /* SecEscrowRequestsTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SecEscrowRequestsTests-Info.plist"; sourceTree = "<group>"; };
+               DCA9D83C21FFE50900B27421 /* EscrowRequestXPCServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestXPCServer.m; sourceTree = "<group>"; };
+               DCA9D83D21FFE50A00B27421 /* EscrowRequestXPCServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestXPCServer.h; sourceTree = "<group>"; };
+               DCA9D83F21FFE62A00B27421 /* EscrowRequestXPCProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestXPCProtocol.h; sourceTree = "<group>"; };
+               DCA9D84521FFE7CF00B27421 /* EscrowRequestXPCProtocol.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestXPCProtocol.m; sourceTree = "<group>"; };
+               DCA9D84B21FFF04600B27421 /* EscrowRequestServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestServer.h; sourceTree = "<group>"; };
+               DCA9D84C21FFF04700B27421 /* EscrowRequestServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestServer.m; sourceTree = "<group>"; };
+               DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_RecoveryKey.swift; sourceTree = "<group>"; };
+               DCAB17CB21FFF6C400E1DFCF /* MockSynchronousEscrowServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockSynchronousEscrowServer.h; sourceTree = "<group>"; };
+               DCAB17CC21FFF6C400E1DFCF /* MockSynchronousEscrowServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockSynchronousEscrowServer.m; sourceTree = "<group>"; };
+               DCAB17CF2200D26700E1DFCF /* SecEscrowPendingRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecEscrowPendingRecord.h; sourceTree = "<group>"; };
+               DCAB17D02200D26800E1DFCF /* SecEscrowPendingRecord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecEscrowPendingRecord.m; sourceTree = "<group>"; };
+               DCAB17D32200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SecEscrowPendingRecord+KeychainSupport.h"; sourceTree = "<group>"; };
+               DCAB17D42200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SecEscrowPendingRecord+KeychainSupport.m"; sourceTree = "<group>"; };
+               DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container_MachineIDs.swift; sourceTree = "<group>"; };
+               DCAD8F8A22C55D73007C3872 /* TPPBDispositionDisallowedMachineID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDispositionDisallowedMachineID.h; sourceTree = "<group>"; };
+               DCAD8F8B22C55D75007C3872 /* TPPBDispositionDisallowedMachineID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDispositionDisallowedMachineID.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>"; };
                DCAE1DD52073FCDE00B4F687 /* NSError+UsefulConstructors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError+UsefulConstructors.h"; sourceTree = "<group>"; };
                DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSError+UsefulConstructors.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>"; };
                DCAE1DD52073FCDE00B4F687 /* NSError+UsefulConstructors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError+UsefulConstructors.h"; sourceTree = "<group>"; };
                DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSError+UsefulConstructors.m"; sourceTree = "<group>"; };

+               DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CuttlefishErrors.swift; 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>"; };
                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>"; };
                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>"; };


@@ -11795,8 +14363,6 @@
                DCB341D41D8A2BAC0054D16E /* osxverifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osxverifier.h; sourceTree = "<group>"; };
                DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = u32handleobject.cpp; sourceTree = "<group>"; };
                DCB341D61D8A2BAC0054D16E /* u32handleobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = u32handleobject.h; sourceTree = "<group>"; };
                DCB341D41D8A2BAC0054D16E /* osxverifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osxverifier.h; sourceTree = "<group>"; };
                DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = u32handleobject.cpp; sourceTree = "<group>"; };
                DCB341D61D8A2BAC0054D16E /* u32handleobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = u32handleobject.h; sourceTree = "<group>"; };

-               DCB341D71D8A2BAC0054D16E /* uniformrandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = uniformrandom.cpp; sourceTree = "<group>"; };
-               DCB341D81D8A2BAC0054D16E /* uniformrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uniformrandom.h; sourceTree = "<group>"; };

                DCB341D91D8A2BAC0054D16E /* walkers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walkers.cpp; sourceTree = "<group>"; };
                DCB341DA1D8A2BAC0054D16E /* walkers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = walkers.h; sourceTree = "<group>"; };
                DCB342311D8A2C6B0054D16E /* KeySchema.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeySchema.cpp; sourceTree = "<group>"; };
                DCB341D91D8A2BAC0054D16E /* walkers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = walkers.cpp; sourceTree = "<group>"; };
                DCB341DA1D8A2BAC0054D16E /* walkers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = walkers.h; sourceTree = "<group>"; };
                DCB342311D8A2C6B0054D16E /* KeySchema.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeySchema.cpp; sourceTree = "<group>"; };


@@ -11807,7 +14373,6 @@
                DCB342441D8A32A20054D16E /* SecBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecBase.cpp; sourceTree = "<group>"; };
                DCB342451D8A32A20054D16E /* SecBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBridge.h; sourceTree = "<group>"; };
                DCB342461D8A32A20054D16E /* SecCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecCertificate.cpp; sourceTree = "<group>"; };
                DCB342441D8A32A20054D16E /* SecBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecBase.cpp; sourceTree = "<group>"; };
                DCB342451D8A32A20054D16E /* SecBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecBridge.h; sourceTree = "<group>"; };
                DCB342461D8A32A20054D16E /* SecCertificate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecCertificate.cpp; sourceTree = "<group>"; };

-               DCB342471D8A32A20054D16E /* SecCertificateBundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecCertificateBundle.cpp; sourceTree = "<group>"; };

                DCB342491D8A32A20054D16E /* SecIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecIdentity.cpp; sourceTree = "<group>"; };
                DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecIdentitySearch.cpp; sourceTree = "<group>"; };
                DCB3424B1D8A32A20054D16E /* SecItemConstants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecItemConstants.c; sourceTree = "<group>"; };
                DCB342491D8A32A20054D16E /* SecIdentity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecIdentity.cpp; sourceTree = "<group>"; };
                DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecIdentitySearch.cpp; sourceTree = "<group>"; };
                DCB3424B1D8A32A20054D16E /* SecItemConstants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecItemConstants.c; sourceTree = "<group>"; };


@@ -11858,7 +14423,6 @@
                DCB342A51D8A32A20054D16E /* PolicyCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyCursor.h; sourceTree = "<group>"; };
                DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecCFTypes.cpp; sourceTree = "<group>"; };
                DCB342A71D8A32A20054D16E /* SecCFTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFTypes.h; sourceTree = "<group>"; };
                DCB342A51D8A32A20054D16E /* PolicyCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyCursor.h; sourceTree = "<group>"; };
                DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecCFTypes.cpp; sourceTree = "<group>"; };
                DCB342A71D8A32A20054D16E /* SecCFTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFTypes.h; sourceTree = "<group>"; };

-               DCB342A81D8A32A20054D16E /* SecKeychainAddIToolsPassword.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecKeychainAddIToolsPassword.cpp; sourceTree = "<group>"; };

                DCB342AA1D8A32A20054D16E /* StorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = StorageManager.cpp; sourceTree = "<group>"; };
                DCB342AB1D8A32A20054D16E /* Trust.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = Trust.cpp; sourceTree = "<group>"; };
                DCB342AC1D8A32A20054D16E /* Trust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Trust.h; sourceTree = "<group>"; };
                DCB342AA1D8A32A20054D16E /* StorageManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = StorageManager.cpp; sourceTree = "<group>"; };
                DCB342AB1D8A32A20054D16E /* Trust.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = Trust.cpp; sourceTree = "<group>"; };
                DCB342AC1D8A32A20054D16E /* Trust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Trust.h; sourceTree = "<group>"; };


@@ -11978,8 +14542,22 @@
                DCB344701D8A35270054D16E /* si-20-sectrust-provisioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "si-20-sectrust-provisioning.h"; path = "regressions/si-20-sectrust-provisioning.h"; sourceTree = "<group>"; };
                DCB344711D8A35270054D16E /* si-33-keychain-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-33-keychain-backup.c"; path = "regressions/si-33-keychain-backup.c"; sourceTree = "<group>"; };
                DCB344721D8A35270054D16E /* si-34-one-true-keychain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-34-one-true-keychain.c"; path = "regressions/si-34-one-true-keychain.c"; sourceTree = "<group>"; };
                DCB344701D8A35270054D16E /* si-20-sectrust-provisioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "si-20-sectrust-provisioning.h"; path = "regressions/si-20-sectrust-provisioning.h"; sourceTree = "<group>"; };
                DCB344711D8A35270054D16E /* si-33-keychain-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-33-keychain-backup.c"; path = "regressions/si-33-keychain-backup.c"; sourceTree = "<group>"; };
                DCB344721D8A35270054D16E /* si-34-one-true-keychain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-34-one-true-keychain.c"; path = "regressions/si-34-one-true-keychain.c"; sourceTree = "<group>"; };

+               DCB41DF9216C3F8A00F219E0 /* tpctl-entitlements.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "tpctl-entitlements.plist"; sourceTree = "<group>"; };
+               DCB5516A247F3DB50009A859 /* CKKSCreateCKZoneOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCreateCKZoneOperation.h; sourceTree = "<group>"; };
+               DCB5516B247F3DB50009A859 /* CKKSCreateCKZoneOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSCreateCKZoneOperation.m; sourceTree = "<group>"; };
+               DCB55173247F48290009A859 /* CKKSDeleteCKZoneOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSDeleteCKZoneOperation.h; sourceTree = "<group>"; };
+               DCB55174247F48290009A859 /* CKKSDeleteCKZoneOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSDeleteCKZoneOperation.m; sourceTree = "<group>"; };

                DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSSynchronizeOperation.h; sourceTree = "<group>"; };
                DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSynchronizeOperation.m; sourceTree = "<group>"; };
                DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSSynchronizeOperation.h; sourceTree = "<group>"; };
                DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSynchronizeOperation.m; sourceTree = "<group>"; };

+               DCB946AD22FCB88400BE4490 /* OTDetermineHSA2AccountStatusOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTDetermineHSA2AccountStatusOperation.h; sourceTree = "<group>"; };
+               DCB946AE22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTDetermineHSA2AccountStatusOperation.m; sourceTree = "<group>"; };
+               DCB9475421274A1900ED9272 /* TPHObjcTranslation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPHObjcTranslation.m; sourceTree = "<group>"; };
+               DCB9475721274A4D00ED9272 /* TPHObjcTranslation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPHObjcTranslation.h; sourceTree = "<group>"; };
+               DCB947592127534C00ED9272 /* OctagonTests+SOSUpgrade.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+SOSUpgrade.swift"; sourceTree = "<group>"; };
+               DCB9475B2127562100ED9272 /* OTSOSAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTSOSAdapter.h; sourceTree = "<group>"; };
+               DCB9475C2127562100ED9272 /* OTSOSAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTSOSAdapter.m; sourceTree = "<group>"; };
+               DCBA6F2824105399009A5187 /* CKKSTests+ForwardCompatibility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+ForwardCompatibility.m"; sourceTree = "<group>"; };
+               DCBDA460245A39A300B0938B /* com.apple.TrustedPeersHelper.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.TrustedPeersHelper.sb; sourceTree = "<group>"; };

                DCBDB3B01E57C67500B61300 /* CKKSKeychainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSKeychainView.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>"; };
                DCBDB3B01E57C67500B61300 /* CKKSKeychainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSKeychainView.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>"; };


@@ -11987,9 +14565,25 @@
                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>"; };
                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>"; };

+               DCBF4AE021FFC82100539F0A /* SecEscrowRequestTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecEscrowRequestTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               DCBF4AE321FFC9A800539F0A /* SecEscrowRequestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecEscrowRequestTests.m; sourceTree = "<group>"; };
+               DCBFF830222611A200C5C044 /* OTFetchCKKSKeysOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTFetchCKKSKeysOperation.h; sourceTree = "<group>"; };
+               DCBFF831222611A200C5C044 /* OTFetchCKKSKeysOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTFetchCKKSKeysOperation.m; sourceTree = "<group>"; };
+               DCC03FA223FF521100A4DA3F /* TPSyncingPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPSyncingPolicy.h; sourceTree = "<group>"; };
+               DCC03FA323FF521100A4DA3F /* TPSyncingPolicy.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPSyncingPolicy.m; sourceTree = "<group>"; };

                DCC0800D1CFF7903005C35C8 /* CSSMOID.exp-in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CSSMOID.exp-in"; sourceTree = "<group>"; };
                DCC0800D1CFF7903005C35C8 /* CSSMOID.exp-in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CSSMOID.exp-in"; sourceTree = "<group>"; };

-               DCC5860120BF8A98005C7269 /* SecBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecBase.h; sourceTree = "<group>"; };
+               DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = security_framework.xcconfig; path = xcconfig/security_framework.xcconfig; sourceTree = "<group>"; };
+               DCC40B0F2383786D00402CB9 /* CKKSStates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSStates.h; sourceTree = "<group>"; };
+               DCC40B102383786D00402CB9 /* CKKSStates.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSStates.m; sourceTree = "<group>"; };
+               DCC5417F225C05170095D926 /* OTUploadNewCKKSTLKsOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTUploadNewCKKSTLKsOperation.h; sourceTree = "<group>"; };
+               DCC54180225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTUploadNewCKKSTLKsOperation.m; sourceTree = "<group>"; };

                DCC5860220BF8A98005C7269 /* SecBase.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecBase.c; sourceTree = "<group>"; };
                DCC5860220BF8A98005C7269 /* SecBase.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecBase.c; sourceTree = "<group>"; };

+               DCC5D66B2087FADE00BBC127 /* tpctl-bridging-header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "tpctl-bridging-header.h"; sourceTree = "<group>"; };
+               DCC67E0C20DD7E0A00A70A31 /* OTStates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTStates.h; sourceTree = "<group>"; };
+               DCC67E0D20DD7E0A00A70A31 /* OTStates.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTStates.m; sourceTree = "<group>"; };
+               DCC67E2B20DDC07900A70A31 /* OTPrepareOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTPrepareOperation.h; sourceTree = "<group>"; };
+               DCC67E2C20DDC07900A70A31 /* OTPrepareOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTPrepareOperation.m; sourceTree = "<group>"; };
+               DCC67E3120E16F3100A70A31 /* ObjCImprovements.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObjCImprovements.h; 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>"; };
                DCC78C391D8085D800865A7C /* secd-03-corrupted-items.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-03-corrupted-items.m"; 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>"; };
                DCC78C391D8085D800865A7C /* secd-03-corrupted-items.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-03-corrupted-items.m"; sourceTree = "<group>"; };


@@ -12003,7 +14597,6 @@
                DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-20-keychain_upgrade.m"; sourceTree = "<group>"; };
                DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-21-transmogrify.m"; sourceTree = "<group>"; };
                DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-30-keychain-upgrade.m"; sourceTree = "<group>"; };
                DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-20-keychain_upgrade.m"; sourceTree = "<group>"; };
                DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-21-transmogrify.m"; sourceTree = "<group>"; };
                DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-30-keychain-upgrade.m"; sourceTree = "<group>"; };

-               DCC78C441D8085D800865A7C /* secd-31-keychain-bad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-31-keychain-bad.m"; sourceTree = "<group>"; };

                DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-31-keychain-unreadable.m"; sourceTree = "<group>"; };
                DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-32-restore-bad-backup.m"; sourceTree = "<group>"; };
                DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-33-keychain-ctk.m"; sourceTree = "<group>"; };
                DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-31-keychain-unreadable.m"; sourceTree = "<group>"; };
                DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-32-restore-bad-backup.m"; sourceTree = "<group>"; };
                DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-33-keychain-ctk.m"; sourceTree = "<group>"; };


@@ -12046,7 +14639,6 @@
                DCC78C701D8085D800865A7C /* secd-83-item-match-valid-on-date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-valid-on-date.m"; sourceTree = "<group>"; };
                DCC78C711D8085D800865A7C /* secd-83-item-match-trusted.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-trusted.m"; sourceTree = "<group>"; };
                DCC78C721D8085D800865A7C /* secd-83-item-match.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "secd-83-item-match.h"; sourceTree = "<group>"; };
                DCC78C701D8085D800865A7C /* secd-83-item-match-valid-on-date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-valid-on-date.m"; sourceTree = "<group>"; };
                DCC78C711D8085D800865A7C /* secd-83-item-match-trusted.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-trusted.m"; sourceTree = "<group>"; };
                DCC78C721D8085D800865A7C /* secd-83-item-match.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "secd-83-item-match.h"; sourceTree = "<group>"; };

-               DCC78C741D8085D800865A7C /* secd-95-escrow-persistence.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-95-escrow-persistence.m"; sourceTree = "<group>"; };

                DCC78C751D8085D800865A7C /* secd-100-initialsync.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-100-initialsync.m"; sourceTree = "<group>"; };
                DCC78C761D8085D800865A7C /* secd-130-other-peer-views.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-130-other-peer-views.m"; sourceTree = "<group>"; };
                DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-154-engine-backoff.m"; sourceTree = "<group>"; };
                DCC78C751D8085D800865A7C /* secd-100-initialsync.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-100-initialsync.m"; sourceTree = "<group>"; };
                DCC78C761D8085D800865A7C /* secd-130-other-peer-views.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-130-other-peer-views.m"; sourceTree = "<group>"; };
                DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-154-engine-backoff.m"; sourceTree = "<group>"; };


@@ -12096,7 +14688,6 @@
                DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-42-circlegencount.c"; sourceTree = "<group>"; };
                DCC78D031D8085F200865A7C /* sc-45-digestvector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-45-digestvector.c"; sourceTree = "<group>"; };
                DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-130-resignationticket.c"; sourceTree = "<group>"; };
                DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-42-circlegencount.c"; sourceTree = "<group>"; };
                DCC78D031D8085F200865A7C /* sc-45-digestvector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-45-digestvector.c"; sourceTree = "<group>"; };
                DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-130-resignationticket.c"; sourceTree = "<group>"; };

-               DCC78D061D8085F200865A7C /* sc-150-ring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "sc-150-ring.m"; sourceTree = "<group>"; };

                DCC78D071D8085F200865A7C /* sc-150-backupkeyderivation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-150-backupkeyderivation.c"; sourceTree = "<group>"; };
                DCC78D081D8085F200865A7C /* sc-153-backupslicekeybag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-153-backupslicekeybag.c"; sourceTree = "<group>"; };
                DCC78D091D8085F200865A7C /* SOSCircle_regressions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCircle_regressions.h; sourceTree = "<group>"; };
                DCC78D071D8085F200865A7C /* sc-150-backupkeyderivation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-150-backupkeyderivation.c"; sourceTree = "<group>"; };
                DCC78D081D8085F200865A7C /* sc-153-backupslicekeybag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-153-backupslicekeybag.c"; sourceTree = "<group>"; };
                DCC78D091D8085F200865A7C /* SOSCircle_regressions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCircle_regressions.h; sourceTree = "<group>"; };


@@ -12215,7 +14806,6 @@
                DCC78D891D8085F200865A7C /* SOSCloudCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SOSCloudCircle.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudCircle.h; sourceTree = "<group>"; };
                DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudCircleInternal.h; sourceTree = "<group>"; };
                DCC78D891D8085F200865A7C /* SOSCloudCircle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SOSCloudCircle.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudCircle.h; sourceTree = "<group>"; };
                DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudCircleInternal.h; sourceTree = "<group>"; };

-               DCC78D8C1D8085F200865A7C /* SOSSysdiagnose.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSSysdiagnose.m; sourceTree = "<group>"; };

                DCC78D8D1D8085F200865A7C /* SOSInternal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSInternal.m; sourceTree = "<group>"; };
                DCC78D8E1D8085F200865A7C /* SOSInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSInternal.h; sourceTree = "<group>"; };
                DCC78D8F1D8085F200865A7C /* SOSTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSTypes.h; sourceTree = "<group>"; };
                DCC78D8D1D8085F200865A7C /* SOSInternal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSInternal.m; sourceTree = "<group>"; };
                DCC78D8E1D8085F200865A7C /* SOSInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSInternal.h; sourceTree = "<group>"; };
                DCC78D8F1D8085F200865A7C /* SOSTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSTypes.h; sourceTree = "<group>"; };


@@ -12228,8 +14818,6 @@
                DCC78D991D8085F200865A7C /* keychain_sync_test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keychain_sync_test.m; sourceTree = "<group>"; };
                DCC78D9A1D8085F200865A7C /* keychain_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keychain_log.h; sourceTree = "<group>"; };
                DCC78D9B1D8085F200865A7C /* keychain_log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = keychain_log.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                DCC78D991D8085F200865A7C /* keychain_sync_test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keychain_sync_test.m; sourceTree = "<group>"; };
                DCC78D9A1D8085F200865A7C /* keychain_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keychain_log.h; sourceTree = "<group>"; };
                DCC78D9B1D8085F200865A7C /* keychain_log.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = keychain_log.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };

-               DCC78D9C1D8085F200865A7C /* syncbackup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = syncbackup.h; sourceTree = "<group>"; };
-               DCC78D9D1D8085F200865A7C /* syncbackup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = syncbackup.m; sourceTree = "<group>"; };

                DCC78D9E1D8085F200865A7C /* secViewDisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secViewDisplay.c; sourceTree = "<group>"; };
                DCC78D9F1D8085F200865A7C /* secViewDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secViewDisplay.h; sourceTree = "<group>"; };
                DCC78DA21D8085FC00865A7C /* Security_regressions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Security_regressions.h; path = Regressions/Security_regressions.h; sourceTree = "<group>"; };
                DCC78D9E1D8085F200865A7C /* secViewDisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secViewDisplay.c; sourceTree = "<group>"; };
                DCC78D9F1D8085F200865A7C /* secViewDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secViewDisplay.h; sourceTree = "<group>"; };
                DCC78DA21D8085FC00865A7C /* Security_regressions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Security_regressions.h; path = Regressions/Security_regressions.h; sourceTree = "<group>"; };


@@ -12251,25 +14839,15 @@
                DCC78DB41D8085FC00865A7C /* si-13-item-system.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-13-item-system.m"; sourceTree = "<group>"; };
                DCC78DB51D8085FC00865A7C /* si-14-dateparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-14-dateparse.c"; sourceTree = "<group>"; };
                DCC78DB61D8085FC00865A7C /* si-15-delete-access-group.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-15-delete-access-group.m"; sourceTree = "<group>"; };
                DCC78DB41D8085FC00865A7C /* si-13-item-system.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-13-item-system.m"; sourceTree = "<group>"; };
                DCC78DB51D8085FC00865A7C /* si-14-dateparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-14-dateparse.c"; sourceTree = "<group>"; };
                DCC78DB61D8085FC00865A7C /* si-15-delete-access-group.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-15-delete-access-group.m"; sourceTree = "<group>"; };

-               DCC78DB71D8085FC00865A7C /* si-15-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-15-certificate.c"; sourceTree = "<group>"; };
-               DCC78DB81D8085FC00865A7C /* si-16-ec-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-16-ec-certificate.c"; sourceTree = "<group>"; };

                DCC78DB91D8085FC00865A7C /* si-17-item-system-bluetooth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-17-item-system-bluetooth.m"; sourceTree = "<group>"; };
                DCC78DB91D8085FC00865A7C /* si-17-item-system-bluetooth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-17-item-system-bluetooth.m"; sourceTree = "<group>"; };

-               DCC78DBA1D8085FC00865A7C /* si-20-sectrust-policies.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-20-sectrust-policies.m"; path = "../../../../shared_regressions/si-20-sectrust-policies.m"; sourceTree = "<group>"; };
-               DCC78DBB1D8085FC00865A7C /* si-20-sectrust.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-20-sectrust.c"; sourceTree = "<group>"; };
-               DCC78DBC1D8085FC00865A7C /* si-20-sectrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-20-sectrust.h"; sourceTree = "<group>"; };

                DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-21-sectrust-asr.c"; sourceTree = "<group>"; };
                DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-22-sectrust-iap.c"; sourceTree = "<group>"; };
                DCC78DBF1D8085FC00865A7C /* si-22-sectrust-iap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-22-sectrust-iap.h"; sourceTree = "<group>"; };
                DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-21-sectrust-asr.c"; sourceTree = "<group>"; };
                DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-22-sectrust-iap.c"; sourceTree = "<group>"; };
                DCC78DBF1D8085FC00865A7C /* si-22-sectrust-iap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-22-sectrust-iap.h"; sourceTree = "<group>"; };

-               DCC78DC01D8085FC00865A7C /* si-23-sectrust-ocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-23-sectrust-ocsp.c"; sourceTree = "<group>"; };

                DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-digicert-malaysia.c"; sourceTree = "<group>"; };
                DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-diginotar.c"; sourceTree = "<group>"; };
                DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-itms.c"; sourceTree = "<group>"; };
                DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-digicert-malaysia.c"; sourceTree = "<group>"; };
                DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-diginotar.c"; sourceTree = "<group>"; };
                DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-itms.c"; sourceTree = "<group>"; };

-               DCC78DC41D8085FC00865A7C /* si-24-sectrust-nist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-nist.c"; sourceTree = "<group>"; };

                DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-passbook.c"; sourceTree = "<group>"; };
                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-26-sectrust-copyproperties.c"; sourceTree = "<group>"; };
                DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-passbook.c"; sourceTree = "<group>"; };
                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-26-sectrust-copyproperties.c"; sourceTree = "<group>"; };

-               DCC78DC71D8085FC00865A7C /* si-27-sectrust-exceptions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-27-sectrust-exceptions.c"; sourceTree = "<group>"; };
-               DCC78DC81D8085FC00865A7C /* si-28-sectrustsettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-28-sectrustsettings.m"; sourceTree = "<group>"; };
-               DCC78DC91D8085FC00865A7C /* si-28-sectrustsettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-28-sectrustsettings.h"; sourceTree = "<group>"; };

                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                DCC78DCB1D8085FC00865A7C /* si-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-bad.c"; sourceTree = "<group>"; };
                DCC78DCC1D8085FC00865A7C /* si-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-unreadable.c"; sourceTree = "<group>"; };
                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                DCC78DCB1D8085FC00865A7C /* si-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-bad.c"; sourceTree = "<group>"; };
                DCC78DCC1D8085FC00865A7C /* si-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-unreadable.c"; sourceTree = "<group>"; };


@@ -12301,42 +14879,22 @@
                DCC78DE81D8085FC00865A7C /* si-65-cms-cert-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-65-cms-cert-policy.c"; sourceTree = "<group>"; };
                DCC78DE91D8085FC00865A7C /* signed-receipt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "signed-receipt.h"; sourceTree = "<group>"; };
                DCC78DEB1D8085FC00865A7C /* si-66-smime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-66-smime.c"; sourceTree = "<group>"; };
                DCC78DE81D8085FC00865A7C /* si-65-cms-cert-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-65-cms-cert-policy.c"; sourceTree = "<group>"; };
                DCC78DE91D8085FC00865A7C /* signed-receipt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "signed-receipt.h"; sourceTree = "<group>"; };
                DCC78DEB1D8085FC00865A7C /* si-66-smime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-66-smime.c"; sourceTree = "<group>"; };

-               DCC78DEC1D8085FC00865A7C /* Global Trustee.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Global Trustee.cer.h"; sourceTree = "<group>"; };
-               DCC78DED1D8085FC00865A7C /* UTN-USERFirst-Hardware.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UTN-USERFirst-Hardware.cer.h"; sourceTree = "<group>"; };
-               DCC78DEE1D8085FC00865A7C /* addons.mozilla.org.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = addons.mozilla.org.cer.h; sourceTree = "<group>"; };
-               DCC78DEF1D8085FC00865A7C /* login.live.com.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = login.live.com.cer.h; sourceTree = "<group>"; };
-               DCC78DF01D8085FC00865A7C /* login.skype.com.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = login.skype.com.cer.h; sourceTree = "<group>"; };
-               DCC78DF11D8085FC00865A7C /* login.yahoo.com.1.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = login.yahoo.com.1.cer.h; sourceTree = "<group>"; };
-               DCC78DF21D8085FC00865A7C /* login.yahoo.com.2.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = login.yahoo.com.2.cer.h; sourceTree = "<group>"; };
-               DCC78DF31D8085FC00865A7C /* login.yahoo.com.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = login.yahoo.com.cer.h; sourceTree = "<group>"; };
-               DCC78DF41D8085FC00865A7C /* mail.google.com.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mail.google.com.cer.h; sourceTree = "<group>"; };
-               DCC78DF51D8085FC00865A7C /* www.google.com.cer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = www.google.com.cer.h; sourceTree = "<group>"; };
-               DCC78DF71D8085FC00865A7C /* si-67-sectrust-blocklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-67-sectrust-blocklist.c"; sourceTree = "<group>"; };

                DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-68-secmatchissuer.c"; sourceTree = "<group>"; };
                DCC78DF91D8085FC00865A7C /* si-69-keydesc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-69-keydesc.c"; sourceTree = "<group>"; };
                DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-70-sectrust-unified.c"; sourceTree = "<group>"; };
                DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-71-mobile-store-policy.c"; sourceTree = "<group>"; };
                DCC78DFC1D8085FC00865A7C /* si-72-syncableitems.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-72-syncableitems.c"; sourceTree = "<group>"; };
                DCC78DFD1D8085FC00865A7C /* si-73-secpasswordgenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-73-secpasswordgenerate.c"; sourceTree = "<group>"; };
                DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-68-secmatchissuer.c"; sourceTree = "<group>"; };
                DCC78DF91D8085FC00865A7C /* si-69-keydesc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-69-keydesc.c"; sourceTree = "<group>"; };
                DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-70-sectrust-unified.c"; sourceTree = "<group>"; };
                DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-71-mobile-store-policy.c"; sourceTree = "<group>"; };
                DCC78DFC1D8085FC00865A7C /* si-72-syncableitems.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-72-syncableitems.c"; sourceTree = "<group>"; };
                DCC78DFD1D8085FC00865A7C /* si-73-secpasswordgenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-73-secpasswordgenerate.c"; sourceTree = "<group>"; };

-               DCC78DFE1D8085FC00865A7C /* si-74-OTAPKISigner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-74-OTAPKISigner.c"; sourceTree = "<group>"; };

                DCC78DFF1D8085FC00865A7C /* si-76-shared-credentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-76-shared-credentials.c"; sourceTree = "<group>"; };
                DCC78E001D8085FC00865A7C /* si_77_SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = si_77_SecAccessControl.c; sourceTree = "<group>"; };
                DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-78-query-attrs.c"; sourceTree = "<group>"; };
                DCC78E021D8085FC00865A7C /* si-80-empty-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-80-empty-data.c"; sourceTree = "<group>"; };
                DCC78DFF1D8085FC00865A7C /* si-76-shared-credentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-76-shared-credentials.c"; sourceTree = "<group>"; };
                DCC78E001D8085FC00865A7C /* si_77_SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = si_77_SecAccessControl.c; sourceTree = "<group>"; };
                DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-78-query-attrs.c"; sourceTree = "<group>"; };
                DCC78E021D8085FC00865A7C /* si-80-empty-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-80-empty-data.c"; sourceTree = "<group>"; };

-               DCC78E031D8085FC00865A7C /* si-82-seccertificate-ct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-82-seccertificate-ct.c"; path = "../../../../shared_regressions/si-82-seccertificate-ct.c"; sourceTree = "<group>"; };
-               DCC78E041D8085FC00865A7C /* si-82-sectrust-ct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-82-sectrust-ct.m"; path = "../../../../shared_regressions/si-82-sectrust-ct.m"; sourceTree = "<group>"; };

                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-82-token-ag.c"; sourceTree = "<group>"; };
                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-83-seccertificate-sighashalg.c"; sourceTree = "<group>"; };
                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-82-token-ag.c"; sourceTree = "<group>"; };
                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-83-seccertificate-sighashalg.c"; sourceTree = "<group>"; };

-               DCC78E071D8085FC00865A7C /* si-85-sectrust-ssl-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-85-sectrust-ssl-policy.c"; 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.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-89-cms-hash-agility.m"; 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>"; };
                DCC78E0F1D8085FC00865A7C /* si-95-cms-basic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-95-cms-basic.h"; 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>"; };
                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>"; };
                DCC78E0F1D8085FC00865A7C /* si-95-cms-basic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-95-cms-basic.h"; sourceTree = "<group>"; };

-               DCC78E101D8085FC00865A7C /* si-97-sectrust-path-scoring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-97-sectrust-path-scoring.m"; sourceTree = "<group>"; };
-               DCC78E111D8085FC00865A7C /* si-97-sectrust-path-scoring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-97-sectrust-path-scoring.h"; sourceTree = "<group>"; };

                DCC78E131D8085FC00865A7C /* vmdh-40.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-40.c"; sourceTree = "<group>"; };
                DCC78E141D8085FC00865A7C /* vmdh-41-example.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-41-example.c"; sourceTree = "<group>"; };
                DCC78E151D8085FC00865A7C /* vmdh-42-example2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-42-example2.c"; sourceTree = "<group>"; };
                DCC78E131D8085FC00865A7C /* vmdh-40.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-40.c"; sourceTree = "<group>"; };
                DCC78E141D8085FC00865A7C /* vmdh-41-example.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-41-example.c"; sourceTree = "<group>"; };
                DCC78E151D8085FC00865A7C /* vmdh-42-example2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "vmdh-42-example2.c"; sourceTree = "<group>"; };


@@ -12349,7 +14907,7 @@
                DCC78E1E1D8085FC00865A7C /* codesign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codesign.c; sourceTree = "<group>"; };
                DCC78E1F1D8085FC00865A7C /* keychain_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keychain_add.c; sourceTree = "<group>"; };
                DCC78E201D8085FC00865A7C /* keychain_find.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keychain_find.m; sourceTree = "<group>"; };
                DCC78E1E1D8085FC00865A7C /* codesign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = codesign.c; sourceTree = "<group>"; };
                DCC78E1F1D8085FC00865A7C /* keychain_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keychain_add.c; sourceTree = "<group>"; };
                DCC78E201D8085FC00865A7C /* keychain_find.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keychain_find.m; sourceTree = "<group>"; };

-               DCC78E211D8085FC00865A7C /* keychain_backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keychain_backup.c; path = ../Security/Tool/keychain_backup.c; sourceTree = "<group>"; };
+               DCC78E211D8085FC00865A7C /* keychain_backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keychain_backup.c; sourceTree = "<group>"; };

                DCC78E221D8085FC00865A7C /* pkcs12_util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs12_util.c; sourceTree = "<group>"; };
                DCC78E231D8085FC00865A7C /* scep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scep.c; sourceTree = "<group>"; };
                DCC78E241D8085FC00865A7C /* SecurityCommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityCommands.h; sourceTree = "<group>"; };
                DCC78E221D8085FC00865A7C /* pkcs12_util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkcs12_util.c; sourceTree = "<group>"; };
                DCC78E231D8085FC00865A7C /* scep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scep.c; sourceTree = "<group>"; };
                DCC78E241D8085FC00865A7C /* SecurityCommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecurityCommands.h; sourceTree = "<group>"; };


@@ -12380,7 +14938,7 @@
                DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecItemBackup.c; sourceTree = "<group>"; };
                DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecItemConstants.c; sourceTree = "<group>"; };
                DCC78E5F1D8085FC00865A7C /* SecItemShim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecItemShim.h; sourceTree = "<group>"; };
                DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecItemBackup.c; sourceTree = "<group>"; };
                DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecItemConstants.c; sourceTree = "<group>"; };
                DCC78E5F1D8085FC00865A7C /* SecItemShim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecItemShim.h; sourceTree = "<group>"; };

-               DCC78E601D8085FC00865A7C /* SecKey.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecKey.c; sourceTree = "<group>"; };
+               DCC78E601D8085FC00865A7C /* SecKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecKey.m; sourceTree = "<group>"; };

                DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecKeyAdaptors.m; sourceTree = "<group>"; };
                DCC78E651D8085FC00865A7C /* SecLogging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecLogging.c; sourceTree = "<group>"; };
                DCC78E661D8085FC00865A7C /* SecLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecLogging.h; sourceTree = "<group>"; };
                DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecKeyAdaptors.m; sourceTree = "<group>"; };
                DCC78E651D8085FC00865A7C /* SecLogging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecLogging.c; sourceTree = "<group>"; };
                DCC78E661D8085FC00865A7C /* SecLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecLogging.h; sourceTree = "<group>"; };


@@ -12489,8 +15047,6 @@
                DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cskernel.cpp; sourceTree = "<group>"; };
                DCD067CB1D8CDF7E007602F1 /* csprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csprocess.h; sourceTree = "<group>"; };
                DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csprocess.cpp; sourceTree = "<group>"; };
                DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cskernel.cpp; sourceTree = "<group>"; };
                DCD067CB1D8CDF7E007602F1 /* csprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csprocess.h; sourceTree = "<group>"; };
                DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csprocess.cpp; sourceTree = "<group>"; };

-               DCD067CD1D8CDF7E007602F1 /* csgeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = csgeneric.h; sourceTree = "<group>"; };
-               DCD067CE1D8CDF7E007602F1 /* csgeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = csgeneric.cpp; sourceTree = "<group>"; };

                DCD067D01D8CDF7E007602F1 /* diskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = diskrep.h; sourceTree = "<group>"; };
                DCD067D11D8CDF7E007602F1 /* diskrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = diskrep.cpp; sourceTree = "<group>"; };
                DCD067D21D8CDF7E007602F1 /* filediskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filediskrep.h; sourceTree = "<group>"; };
                DCD067D01D8CDF7E007602F1 /* diskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = diskrep.h; sourceTree = "<group>"; };
                DCD067D11D8CDF7E007602F1 /* diskrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = diskrep.cpp; sourceTree = "<group>"; };
                DCD067D21D8CDF7E007602F1 /* filediskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filediskrep.h; sourceTree = "<group>"; };


@@ -12511,8 +15067,6 @@
                DCD067E11D8CDF7E007602F1 /* detachedrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detachedrep.cpp; sourceTree = "<group>"; };
                DCD067E21D8CDF7E007602F1 /* piddiskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = piddiskrep.h; sourceTree = "<group>"; usesTabs = 0; };
                DCD067E31D8CDF7E007602F1 /* piddiskrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = piddiskrep.cpp; sourceTree = "<group>"; usesTabs = 1; };
                DCD067E11D8CDF7E007602F1 /* detachedrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = detachedrep.cpp; sourceTree = "<group>"; };
                DCD067E21D8CDF7E007602F1 /* piddiskrep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = piddiskrep.h; sourceTree = "<group>"; usesTabs = 0; };
                DCD067E31D8CDF7E007602F1 /* piddiskrep.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = piddiskrep.cpp; sourceTree = "<group>"; usesTabs = 1; };

-               DCD067E71D8CDF7E007602F1 /* SecCodeHostLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCodeHostLib.h; sourceTree = "<group>"; };
-               DCD067E81D8CDF7E007602F1 /* SecCodeHostLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCodeHostLib.c; sourceTree = "<group>"; };

                DCD067EA1D8CDF7E007602F1 /* sp-watch.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = "sp-watch.d"; path = "../dtrace/sp-watch.d"; sourceTree = "<group>"; };
                DCD067EB1D8CDF7E007602F1 /* security_codesigning.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = security_codesigning.d; sourceTree = "<group>"; };
                DCD067EC1D8CDF7E007602F1 /* codesign-watch.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = "codesign-watch.d"; path = "../dtrace/codesign-watch.d"; sourceTree = "<group>"; };
                DCD067EA1D8CDF7E007602F1 /* sp-watch.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = "sp-watch.d"; path = "../dtrace/sp-watch.d"; sourceTree = "<group>"; };
                DCD067EB1D8CDF7E007602F1 /* security_codesigning.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = security_codesigning.d; sourceTree = "<group>"; };
                DCD067EC1D8CDF7E007602F1 /* codesign-watch.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = "codesign-watch.d"; path = "../dtrace/codesign-watch.d"; sourceTree = "<group>"; };


@@ -12538,7 +15092,7 @@
                DCD068061D8CDF7E007602F1 /* SecAssessment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SecAssessment.h; sourceTree = "<group>"; };
                DCD068071D8CDF7E007602F1 /* SecAssessment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = SecAssessment.cpp; sourceTree = "<group>"; };
                DCD068081D8CDF7E007602F1 /* evaluationmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = evaluationmanager.h; sourceTree = "<group>"; };
                DCD068061D8CDF7E007602F1 /* SecAssessment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SecAssessment.h; sourceTree = "<group>"; };
                DCD068071D8CDF7E007602F1 /* SecAssessment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = SecAssessment.cpp; sourceTree = "<group>"; };
                DCD068081D8CDF7E007602F1 /* evaluationmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = evaluationmanager.h; sourceTree = "<group>"; };

-               DCD068091D8CDF7E007602F1 /* evaluationmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = evaluationmanager.cpp; sourceTree = "<group>"; };
+               DCD068091D8CDF7E007602F1 /* evaluationmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = evaluationmanager.cpp; sourceTree = "<group>"; usesTabs = 0; };

                DCD0680A1D8CDF7E007602F1 /* opaquewhitelist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opaquewhitelist.h; sourceTree = "<group>"; };
                DCD0680B1D8CDF7E007602F1 /* opaquewhitelist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opaquewhitelist.cpp; sourceTree = "<group>"; };
                DCD0680C1D8CDF7E007602F1 /* policydb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = policydb.h; sourceTree = "<group>"; };
                DCD0680A1D8CDF7E007602F1 /* opaquewhitelist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opaquewhitelist.h; sourceTree = "<group>"; };
                DCD0680B1D8CDF7E007602F1 /* opaquewhitelist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opaquewhitelist.cpp; sourceTree = "<group>"; };
                DCD0680C1D8CDF7E007602F1 /* policydb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = policydb.h; sourceTree = "<group>"; };


@@ -12668,8 +15222,6 @@
                DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = debugging_internal.h; sourceTree = "<group>"; };
                DCD06AC41D8E0D7D007602F1 /* debugsupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugsupport.h; sourceTree = "<group>"; };
                DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugging_internal.cpp; sourceTree = "<group>"; };
                DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = debugging_internal.h; sourceTree = "<group>"; };
                DCD06AC41D8E0D7D007602F1 /* debugsupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugsupport.h; sourceTree = "<group>"; };
                DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugging_internal.cpp; sourceTree = "<group>"; };

-               DCD06AC61D8E0D7D007602F1 /* devrandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = devrandom.h; sourceTree = "<group>"; };
-               DCD06AC71D8E0D7D007602F1 /* devrandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devrandom.cpp; sourceTree = "<group>"; };

                DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dispatch.cpp; sourceTree = "<group>"; };
                DCD06AC91D8E0D7D007602F1 /* dispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dispatch.h; sourceTree = "<group>"; };
                DCD06ACA1D8E0D7D007602F1 /* endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = endian.h; sourceTree = "<group>"; };
                DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dispatch.cpp; sourceTree = "<group>"; };
                DCD06AC91D8E0D7D007602F1 /* dispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dispatch.h; sourceTree = "<group>"; };
                DCD06ACA1D8E0D7D007602F1 /* endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = endian.h; sourceTree = "<group>"; };


@@ -12696,8 +15248,6 @@
                DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simpleprefs.cpp; sourceTree = "<group>"; };
                DCD06AE31D8E0D7D007602F1 /* sqlite++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sqlite++.h"; sourceTree = "<group>"; };
                DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sqlite++.cpp"; sourceTree = "<group>"; };
                DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = simpleprefs.cpp; sourceTree = "<group>"; };
                DCD06AE31D8E0D7D007602F1 /* sqlite++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sqlite++.h"; sourceTree = "<group>"; };
                DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "sqlite++.cpp"; sourceTree = "<group>"; };

-               DCD06AE51D8E0D7D007602F1 /* streams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = streams.h; sourceTree = "<group>"; };
-               DCD06AE61D8E0D7D007602F1 /* streams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = streams.cpp; sourceTree = "<group>"; };

                DCD06AE71D8E0D7D007602F1 /* superblob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = superblob.h; sourceTree = "<group>"; };
                DCD06AE81D8E0D7D007602F1 /* superblob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = superblob.cpp; sourceTree = "<group>"; };
                DCD06AE91D8E0D7D007602F1 /* threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threading.h; sourceTree = "<group>"; };
                DCD06AE71D8E0D7D007602F1 /* superblob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = superblob.h; sourceTree = "<group>"; };
                DCD06AE81D8E0D7D007602F1 /* superblob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = superblob.cpp; sourceTree = "<group>"; };
                DCD06AE91D8E0D7D007602F1 /* threading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threading.h; sourceTree = "<group>"; };


@@ -12724,12 +15274,8 @@
                DCD06B061D8E0D7D007602F1 /* unix++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "unix++.cpp"; sourceTree = "<group>"; };
                DCD06B071D8E0D7D007602F1 /* unixchild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unixchild.h; sourceTree = "<group>"; };
                DCD06B081D8E0D7D007602F1 /* unixchild.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = unixchild.cpp; sourceTree = "<group>"; };
                DCD06B061D8E0D7D007602F1 /* unix++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "unix++.cpp"; sourceTree = "<group>"; };
                DCD06B071D8E0D7D007602F1 /* unixchild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unixchild.h; sourceTree = "<group>"; };
                DCD06B081D8E0D7D007602F1 /* unixchild.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = unixchild.cpp; sourceTree = "<group>"; };

-               DCD06B091D8E0D7D007602F1 /* vproc++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "vproc++.h"; sourceTree = "<group>"; };
-               DCD06B0A1D8E0D7D007602F1 /* vproc++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "vproc++.cpp"; sourceTree = "<group>"; };

                DCD06B0C1D8E0D7D007602F1 /* mach++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mach++.h"; sourceTree = "<group>"; };
                DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mach++.cpp"; sourceTree = "<group>"; };
                DCD06B0C1D8E0D7D007602F1 /* mach++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mach++.h"; sourceTree = "<group>"; };
                DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "mach++.cpp"; sourceTree = "<group>"; };

-               DCD06B0E1D8E0D7D007602F1 /* mach_notify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mach_notify.h; sourceTree = "<group>"; };
-               DCD06B0F1D8E0D7D007602F1 /* mach_notify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mach_notify.c; sourceTree = "<group>"; };

                DCD06B101D8E0D7D007602F1 /* cfmach++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "cfmach++.h"; sourceTree = "<group>"; };
                DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "cfmach++.cpp"; sourceTree = "<group>"; };
                DCD06B121D8E0D7D007602F1 /* macho++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "macho++.h"; sourceTree = "<group>"; };
                DCD06B101D8E0D7D007602F1 /* cfmach++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "cfmach++.h"; sourceTree = "<group>"; };
                DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = "cfmach++.cpp"; sourceTree = "<group>"; };
                DCD06B121D8E0D7D007602F1 /* macho++.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "macho++.h"; sourceTree = "<group>"; };


@@ -12739,8 +15285,6 @@
                DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dyld_cache_format.h; sourceTree = "<group>"; };
                DCD06B171D8E0D7D007602F1 /* machserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = machserver.h; sourceTree = "<group>"; };
                DCD06B181D8E0D7D007602F1 /* machserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = machserver.cpp; sourceTree = "<group>"; };
                DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dyld_cache_format.h; sourceTree = "<group>"; };
                DCD06B171D8E0D7D007602F1 /* machserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = machserver.h; sourceTree = "<group>"; };
                DCD06B181D8E0D7D007602F1 /* machserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = machserver.cpp; sourceTree = "<group>"; };

-               DCD06B191D8E0D7D007602F1 /* machrunloopserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = machrunloopserver.h; sourceTree = "<group>"; };
-               DCD06B1A1D8E0D7D007602F1 /* machrunloopserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = machrunloopserver.cpp; sourceTree = "<group>"; };

                DCD06B1C1D8E0D7D007602F1 /* coderepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coderepository.h; sourceTree = "<group>"; };
                DCD06B1D1D8E0D7D007602F1 /* coderepository.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = coderepository.cpp; sourceTree = "<group>"; };
                DCD06B1E1D8E0D7D007602F1 /* cfclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cfclass.h; sourceTree = "<group>"; };
                DCD06B1C1D8E0D7D007602F1 /* coderepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coderepository.h; sourceTree = "<group>"; };
                DCD06B1D1D8E0D7D007602F1 /* coderepository.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = coderepository.cpp; sourceTree = "<group>"; };
                DCD06B1E1D8E0D7D007602F1 /* cfclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cfclass.h; sourceTree = "<group>"; };


@@ -12751,9 +15295,19 @@
                DCD06B231D8E0D7D007602F1 /* cfutilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = cfutilities.cpp; sourceTree = "<group>"; };
                DCD06BC21D8E0DC2007602F1 /* utilities_dtrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utilities_dtrace.h; path = derived_src/security_utilities/utilities_dtrace.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DCD06BC51D8E0DD3007602F1 /* security_utilities.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = security_utilities.d; path = lib/security_utilities.d; sourceTree = "<group>"; };
                DCD06B231D8E0D7D007602F1 /* cfutilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = cfutilities.cpp; sourceTree = "<group>"; };
                DCD06BC21D8E0DC2007602F1 /* utilities_dtrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utilities_dtrace.h; path = derived_src/security_utilities/utilities_dtrace.h; sourceTree = BUILT_PRODUCTS_DIR; };
                DCD06BC51D8E0DD3007602F1 /* security_utilities.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = security_utilities.d; path = lib/security_utilities.d; sourceTree = "<group>"; };

+               DCD33D79220B985A000A390B /* EscrowRequestController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestController.h; sourceTree = "<group>"; };
+               DCD33D7A220B985A000A390B /* EscrowRequestController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestController.m; sourceTree = "<group>"; };
+               DCD33D7E220B9DC8000A390B /* OctagonStateMachineHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonStateMachineHelpers.h; sourceTree = "<group>"; };
+               DCD33D7F220B9DC8000A390B /* OctagonStateMachineHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonStateMachineHelpers.m; sourceTree = "<group>"; };
+               DCD33D8C220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestInformCloudServicesOperation.h; sourceTree = "<group>"; };
+               DCD33D8D220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestInformCloudServicesOperation.m; sourceTree = "<group>"; };
+               DCD33D91220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestPerformEscrowEnrollOperation.h; sourceTree = "<group>"; };
+               DCD33D92220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestPerformEscrowEnrollOperation.m; sourceTree = "<group>"; };

                DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-cms-signing-identity-p12.h"; sourceTree = "<group>"; };
                DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-cms-signing-identity-p12.c"; sourceTree = "<group>"; };
                DCD45358209A5C2D0086CBFC /* kc-keychain-file-helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "kc-keychain-file-helpers.c"; path = "regressions/kc-keychain-file-helpers.c"; sourceTree = "<group>"; };
                DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-cms-signing-identity-p12.h"; sourceTree = "<group>"; };
                DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-cms-signing-identity-p12.c"; sourceTree = "<group>"; };
                DCD45358209A5C2D0086CBFC /* kc-keychain-file-helpers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "kc-keychain-file-helpers.c"; path = "regressions/kc-keychain-file-helpers.c"; sourceTree = "<group>"; };

+               DCD48BFC20BF3D83009A3224 /* tpctl-objc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "tpctl-objc.h"; sourceTree = "<group>"; };
+               DCD48BFD20BF3D83009A3224 /* tpctl-objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "tpctl-objc.m"; sourceTree = "<group>"; };

                DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSNewTLKOperation.h; sourceTree = "<group>"; };
                DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSNewTLKOperation.m; sourceTree = "<group>"; };
                DCD66D731D8204A700DB1393 /* libSecTrustOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecTrustOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCD662F31E329B6800188186 /* CKKSNewTLKOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSNewTLKOperation.h; sourceTree = "<group>"; };
                DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSNewTLKOperation.m; sourceTree = "<group>"; };
                DCD66D731D8204A700DB1393 /* libSecTrustOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSecTrustOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };


@@ -12761,21 +15315,25 @@
                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>"; };
                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>"; };

+               DCD7DD9B22B868C100161396 /* TPPBDispositionDuplicateMachineID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPPBDispositionDuplicateMachineID.m; sourceTree = "<group>"; };
+               DCD7DD9D22B868C200161396 /* TPPBDispositionDuplicateMachineID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPPBDispositionDuplicateMachineID.h; 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; };
                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; };

+               DCDACB5724A3F1AA0054080C /* com.apple.security.ckks.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.ckks.plist; sourceTree = "<group>"; };

                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>"; };
                DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSItem.h; sourceTree = "<group>"; };
                DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSItem.m; sourceTree = "<group>"; };
                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>"; };
                DCDCCB8D1DF7B8D4006E840E /* CKKSItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSItem.h; sourceTree = "<group>"; };
                DCDCCB8E1DF7B8D4006E840E /* CKKSItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSItem.m; sourceTree = "<group>"; };

+               DCDF03112284E34B008055BA /* OctagonTests+EscrowRecovery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+EscrowRecovery.swift"; sourceTree = "<group>"; };

                DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-cms-hash-agility-data.h"; sourceTree = "<group>"; };
                DCE2341620A3D4B8009766A3 /* si-cms-hash-agility-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-cms-hash-agility-data.c"; sourceTree = "<group>"; };
                DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCurrentItemPointer.h; sourceTree = "<group>"; };
                DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSCurrentItemPointer.m; sourceTree = "<group>"; };
                DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSUpdateCurrentItemPointerOperation.h; sourceTree = "<group>"; };
                DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSUpdateCurrentItemPointerOperation.m; sourceTree = "<group>"; };
                DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-cms-hash-agility-data.h"; sourceTree = "<group>"; };
                DCE2341620A3D4B8009766A3 /* si-cms-hash-agility-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-cms-hash-agility-data.c"; sourceTree = "<group>"; };
                DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCurrentItemPointer.h; sourceTree = "<group>"; };
                DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSCurrentItemPointer.m; sourceTree = "<group>"; };
                DCE278E61ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSUpdateCurrentItemPointerOperation.h; sourceTree = "<group>"; };
                DCE278E71ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSUpdateCurrentItemPointerOperation.m; sourceTree = "<group>"; };

+               DCE405C423A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+CKKSConfiguration.swift"; sourceTree = "<group>"; };

                DCE4E6A41D7A37FA00AFB96E /* security2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = security2; sourceTree = BUILT_PRODUCTS_DIR; };
                DCE4E6A41D7A37FA00AFB96E /* security2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = security2; sourceTree = BUILT_PRODUCTS_DIR; };

-               DCE4E6A71D7A38C000AFB96E /* security2.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; name = security2.1; path = ../OSX/security2/security2.1; sourceTree = "<group>"; };
-               DCE4E6D41D7A41E400AFB96E /* bc-10-knife-on-bread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "bc-10-knife-on-bread.m"; path = "OSX/Breadcrumb/bc-10-knife-on-bread.m"; sourceTree = "<group>"; };
+               DCE4E6A71D7A38C000AFB96E /* security2.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = security2.1; sourceTree = "<group>"; };

                DCE4E6D71D7A420D00AFB96E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OSX/SecurityTestsOSX/main.m; sourceTree = "<group>"; };
                DCE4E6E71D7A427200AFB96E /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/SecurityFoundation.framework; sourceTree = DEVELOPER_DIR; };
                DCE4E72E1D7A436300AFB96E /* si-82-sectrust-ct-logs.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "si-82-sectrust-ct-logs.plist"; path = "OSX/shared_regressions/si-82-sectrust-ct-logs.plist"; sourceTree = SOURCE_ROOT; };
                DCE4E6D71D7A420D00AFB96E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OSX/SecurityTestsOSX/main.m; sourceTree = "<group>"; };
                DCE4E6E71D7A427200AFB96E /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/SecurityFoundation.framework; sourceTree = DEVELOPER_DIR; };
                DCE4E72E1D7A436300AFB96E /* si-82-sectrust-ct-logs.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "si-82-sectrust-ct-logs.plist"; path = "OSX/shared_regressions/si-82-sectrust-ct-logs.plist"; sourceTree = SOURCE_ROOT; };


@@ -12784,8 +15342,8 @@
                DCE4E7CC1D7A4AED00AFB96E /* sectests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sectests; sourceTree = BUILT_PRODUCTS_DIR; };
                DCE4E7E11D7A4B7F00AFB96E /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = OSX/sectests/main.c; sourceTree = SOURCE_ROOT; };
                DCE4E7F61D7A4DA800AFB96E /* secd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secd; sourceTree = BUILT_PRODUCTS_DIR; };
                DCE4E7CC1D7A4AED00AFB96E /* sectests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sectests; sourceTree = BUILT_PRODUCTS_DIR; };
                DCE4E7E11D7A4B7F00AFB96E /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = OSX/sectests/main.c; sourceTree = SOURCE_ROOT; };
                DCE4E7F61D7A4DA800AFB96E /* secd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secd; sourceTree = BUILT_PRODUCTS_DIR; };

-               DCE4E8091D7A4E1C00AFB96E /* com.apple.secd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = com.apple.secd.plist; path = ../ipc/com.apple.secd.plist; sourceTree = "<group>"; };
-               DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = com.apple.securityd.plist; path = OSX/sec/os_log/com.apple.securityd.plist; sourceTree = "<group>"; };
+               DCE4E8091D7A4E1C00AFB96E /* com.apple.secd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.secd.plist; sourceTree = "<group>"; };
+               DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.securityd.plist; sourceTree = "<group>"; };

                DCE4E8141D7A4E6F00AFB96E /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
                DCE4E81B1D7A4E8F00AFB96E /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libsqlite3.0.dylib; sourceTree = DEVELOPER_DIR; };
                DCE4E8271D7A4F0E00AFB96E /* login.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = login.framework; path = System/Library/PrivateFrameworks/login.framework; sourceTree = SDKROOT; };
                DCE4E8141D7A4E6F00AFB96E /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
                DCE4E81B1D7A4E8F00AFB96E /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/lib/libsqlite3.0.dylib; sourceTree = DEVELOPER_DIR; };
                DCE4E8271D7A4F0E00AFB96E /* login.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = login.framework; path = System/Library/PrivateFrameworks/login.framework; sourceTree = SDKROOT; };


@@ -12840,15 +15398,26 @@
                DCE4E9451D7F3E8700AFB96E /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = "OSX/Keychain Circle Notification/en.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; };
                DCE4E9461D7F3E8700AFB96E /* com.apple.security.keychain-circle-notification.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "com.apple.security.keychain-circle-notification.plist"; sourceTree = "<group>"; };
                DCE4E9481D7F3E8700AFB96E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = "OSX/Keychain Circle Notification/en.lproj/InfoPlist.strings"; sourceTree = SOURCE_ROOT; };
                DCE4E9451D7F3E8700AFB96E /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = "OSX/Keychain Circle Notification/en.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; };
                DCE4E9461D7F3E8700AFB96E /* com.apple.security.keychain-circle-notification.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "com.apple.security.keychain-circle-notification.plist"; sourceTree = "<group>"; };
                DCE4E9481D7F3E8700AFB96E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = "OSX/Keychain Circle Notification/en.lproj/InfoPlist.strings"; sourceTree = SOURCE_ROOT; };

-               DCE7F2081F21726500DDB0F7 /* CKKSAPSReceiverTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSAPSReceiverTests.m; sourceTree = "<group>"; };
+               DCE772642290712F005862B4 /* OctagonCheckTrustStateOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonCheckTrustStateOperation.h; sourceTree = "<group>"; };
+               DCE772652290712F005862B4 /* OctagonCheckTrustStateOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonCheckTrustStateOperation.m; sourceTree = "<group>"; };
+               DCE7F2081F21726500DDB0F7 /* OctagonAPSReceiverTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonAPSReceiverTests.m; sourceTree = "<group>"; };
+               DCEA0FF6213F1E6F0054A328 /* Octagon.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Octagon.plist; sourceTree = "<group>"; };

                DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSSIV.h; sourceTree = "<group>"; };
                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSIV.m; sourceTree = "<group>"; };
                DCEA5D531E2826DB0089CF55 /* CKKSSIV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSSIV.h; sourceTree = "<group>"; };
                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSIV.m; sourceTree = "<group>"; };

-               DCEA5D831E2F14810089CF55 /* CKKSAPSReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSAPSReceiver.h; sourceTree = "<group>"; };
-               DCEA5D841E2F14810089CF55 /* CKKSAPSReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSAPSReceiver.m; sourceTree = "<group>"; };
-               DCEA5D951E3014250089CF55 /* CKKSZone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSZone.h; sourceTree = "<group>"; };
-               DCEA5D961E3014250089CF55 /* CKKSZone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSZone.m; sourceTree = "<group>"; };
+               DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonAPSReceiver.h; sourceTree = "<group>"; };
+               DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OctagonAPSReceiver.m; sourceTree = "<group>"; };

                DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.securityd.plist; path = OSX/sec/ipc/com.apple.securityd.plist; sourceTree = SOURCE_ROOT; };
                DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = com.apple.securityd.plist; path = OSX/sec/ipc/com.apple.securityd.plist; sourceTree = SOURCE_ROOT; };

-               DCF158C52064895C00B87B6D /* CKKSAPSReceiverTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSAPSReceiverTests.h; sourceTree = "<group>"; };
+               DCF12671218A7579000124C6 /* OTLeaveCliqueOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTLeaveCliqueOperation.h; sourceTree = "<group>"; };
+               DCF12672218A757A000124C6 /* OTLeaveCliqueOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTLeaveCliqueOperation.m; sourceTree = "<group>"; };
+               DCF158C52064895C00B87B6D /* OctagonAPSReceiverTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonAPSReceiverTests.h; sourceTree = "<group>"; };
+               DCF216D721ADD5B10029CCC1 /* libprotobuf_source_generation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprotobuf_source_generation.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               DCF458AD221F6890007F5507 /* TPLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TPLog.h; sourceTree = "<group>"; };
+               DCF458AE221F6890007F5507 /* TPLog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TPLog.m; sourceTree = "<group>"; };
+               DCF4657822011E1300BA6EEA /* EscrowRequestCLI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EscrowRequestCLI.h; sourceTree = "<group>"; };
+               DCF4657922011E1300BA6EEA /* EscrowRequestCLI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EscrowRequestCLI.m; sourceTree = "<group>"; };
+               DCF46C2C214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTUpdateTrustedDeviceListOperation.h; sourceTree = "<group>"; };
+               DCF46C2D214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTUpdateTrustedDeviceListOperation.m; sourceTree = "<group>"; };
+               DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CuttlefishAPIHelpers.swift; sourceTree = "<group>"; };

                DCF783141D88B4DE00E694BB /* libsecurity_apple_csp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_apple_csp.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCF783151D88B60D00E694BB /* aesCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aesCommon.h; sourceTree = "<group>"; };
                DCF783161D88B60D00E694BB /* aescsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aescsp.cpp; sourceTree = "<group>"; };
                DCF783141D88B4DE00E694BB /* libsecurity_apple_csp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecurity_apple_csp.a; sourceTree = BUILT_PRODUCTS_DIR; };
                DCF783151D88B60D00E694BB /* aesCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aesCommon.h; sourceTree = "<group>"; };
                DCF783161D88B60D00E694BB /* aescsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aescsp.cpp; sourceTree = "<group>"; };


@@ -12890,18 +15459,6 @@
                DCF7833B1D88B60D00E694BB /* wrapKeyCms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrapKeyCms.cpp; sourceTree = "<group>"; };
                DCF7833C1D88B60D00E694BB /* YarrowConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YarrowConnection.cpp; sourceTree = "<group>"; };
                DCF7833D1D88B60D00E694BB /* YarrowConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YarrowConnection.h; sourceTree = "<group>"; };
                DCF7833B1D88B60D00E694BB /* wrapKeyCms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrapKeyCms.cpp; sourceTree = "<group>"; };
                DCF7833C1D88B60D00E694BB /* YarrowConnection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YarrowConnection.cpp; sourceTree = "<group>"; };
                DCF7833D1D88B60D00E694BB /* YarrowConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YarrowConnection.h; sourceTree = "<group>"; };

-               DCF7833F1D88B60D00E694BB /* algmaker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algmaker.cpp; sourceTree = "<group>"; };
-               DCF783401D88B60D00E694BB /* bsafeAsymmetric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bsafeAsymmetric.cpp; sourceTree = "<group>"; };
-               DCF783411D88B60D00E694BB /* bsafeContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bsafeContext.cpp; sourceTree = "<group>"; };
-               DCF783421D88B60D00E694BB /* bsafecsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsafecsp.h; sourceTree = "<group>"; };
-               DCF783431D88B60D00E694BB /* bsafecspi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsafecspi.h; sourceTree = "<group>"; };
-               DCF783441D88B60D00E694BB /* bsafeKeyGen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bsafeKeyGen.cpp; sourceTree = "<group>"; };
-               DCF783451D88B60D00E694BB /* bsafePKCS1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bsafePKCS1.cpp; sourceTree = "<group>"; };
-               DCF783461D88B60D00E694BB /* bsafePKCS1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsafePKCS1.h; sourceTree = "<group>"; };
-               DCF783471D88B60D00E694BB /* bsafeSymmetric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = bsafeSymmetric.cpp; sourceTree = "<group>"; };
-               DCF783481D88B60D00E694BB /* bsobjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bsobjects.h; sourceTree = "<group>"; };
-               DCF783491D88B60D00E694BB /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
-               DCF7834A1D88B60D00E694BB /* miscalgorithms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = miscalgorithms.cpp; sourceTree = "<group>"; };

                DCF7834C1D88B60D00E694BB /* ascContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ascContext.cpp; sourceTree = "<group>"; };
                DCF7834D1D88B60D00E694BB /* ascContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascContext.h; sourceTree = "<group>"; };
                DCF7834E1D88B60D00E694BB /* ascFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascFactory.h; sourceTree = "<group>"; };
                DCF7834C1D88B60D00E694BB /* ascContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ascContext.cpp; sourceTree = "<group>"; };
                DCF7834D1D88B60D00E694BB /* ascContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascContext.h; sourceTree = "<group>"; };
                DCF7834E1D88B60D00E694BB /* ascFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ascFactory.h; sourceTree = "<group>"; };


@@ -13182,13 +15739,16 @@
                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>"; };
                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>"; };

+               DCF94A79222D9F2400C01744 /* OctagonCKKSPeerAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonCKKSPeerAdapter.h; sourceTree = "<group>"; };
+               DCF94A7A222D9F2400C01744 /* OctagonCKKSPeerAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonCKKSPeerAdapter.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>"; };
                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>"; };

                DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-36-ks-encrypt.m"; sourceTree = "<group>"; };
                DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-36-ks-encrypt.m"; sourceTree = "<group>"; };

-               DCFB12C31E95A4C000510F5F /* CKKSCKAccountStateTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSCKAccountStateTracker.h; sourceTree = "<group>"; };
-               DCFB12C41E95A4C000510F5F /* CKKSCKAccountStateTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSCKAccountStateTracker.m; sourceTree = "<group>"; };
+               DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKKSAccountStateTracker.h; sourceTree = "<group>"; };
+               DCFB12C41E95A4C000510F5F /* CKKSAccountStateTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSAccountStateTracker.m; sourceTree = "<group>"; };
+               DCFC91AD21F16E0B00E674DD /* OctagonStateMachine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonStateMachine.h; sourceTree = "<group>"; };
+               DCFC91AE21F16E0B00E674DD /* OctagonStateMachine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonStateMachine.m; sourceTree = "<group>"; };

                DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSDeviceStateEntry.h; sourceTree = "<group>"; };
                DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSDeviceStateEntry.m; sourceTree = "<group>"; };
                DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCondition.h; sourceTree = "<group>"; };
                DCFE1C251F17E455007640C8 /* CKKSDeviceStateEntry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSDeviceStateEntry.h; sourceTree = "<group>"; };
                DCFE1C261F17E455007640C8 /* CKKSDeviceStateEntry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSDeviceStateEntry.m; sourceTree = "<group>"; };
                DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSCondition.h; sourceTree = "<group>"; };


@@ -13196,6 +15756,26 @@
                DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSConditionTests.m; sourceTree = "<group>"; };
                DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSUpdateDeviceStateOperation.h; sourceTree = "<group>"; };
                DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSUpdateDeviceStateOperation.m; sourceTree = "<group>"; };
                DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSConditionTests.m; sourceTree = "<group>"; };
                DCFE1C4F1F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSUpdateDeviceStateOperation.h; sourceTree = "<group>"; };
                DCFE1C501F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSUpdateDeviceStateOperation.m; sourceTree = "<group>"; };

+               DCFF82702162834C00D54B02 /* OctagonTestsXPCConnections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OctagonTestsXPCConnections.swift; sourceTree = "<group>"; };
+               DCFF82722162876400D54B02 /* OTResetOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTResetOperation.h; sourceTree = "<group>"; };
+               DCFF82732162876400D54B02 /* OTResetOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTResetOperation.m; sourceTree = "<group>"; };
+               E060D19C2124780E0025B833 /* OctagonTestHarness.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OctagonTestHarness.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               E060D19E2124780F0025B833 /* OctagonTestHarness.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTestHarness.h; sourceTree = "<group>"; };
+               E060D19F2124780F0025B833 /* OctagonTestHarnessXPCService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTestHarnessXPCService.h; sourceTree = "<group>"; };
+               E060D1A12124780F0025B833 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               E060D1A72124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OctagonTestHarnessXPCServiceProtocol.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+               E060D1B7212478110025B833 /* OctagonTestHarnessXPCService.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = OctagonTestHarnessXPCService.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+               E060D1BE212478120025B833 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+               E060D1C0212478120025B833 /* OctagonTestHarnessXPCServiceDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OctagonTestHarnessXPCServiceDelegate.h; sourceTree = "<group>"; };
+               E060D1C3212478120025B833 /* OctagonTestHarnessXPCServiceDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonTestHarnessXPCServiceDelegate.m; sourceTree = "<group>"; };
+               E060D1C6212478120025B833 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               E060D23F21247C680025B833 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
+               E060D24221247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OctagonTestHarnessXPCServiceProtocol.m; sourceTree = "<group>"; };
+               E060D24421247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OctagonTestHarnessXPCServiceProtocol.h; sourceTree = "<group>"; };
+               E060D24521247C680025B833 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               E060D2BD21248F820025B833 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
+               E09E09E9215506570042C7D3 /* OctagonTestHarnessXPCService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OctagonTestHarnessXPCService.m; sourceTree = "<group>"; };
+               E291657E2048BCCB0046512B /* TPPBPeerStableInfoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TPPBPeerStableInfoTests.m; path = keychain/trust/TrustedPeersTests/TPPBPeerStableInfoTests.m; sourceTree = SOURCE_ROOT; };

                E7104A0B169E171900DB0045 /* security_tool_commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = security_tool_commands.c; sourceTree = "<group>"; };
                E710C7421331946400F85568 /* SecurityTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecurityTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
                E710C74C1331946500F85568 /* SecurityTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SecurityTests-Info.plist"; sourceTree = "<group>"; };
                E7104A0B169E171900DB0045 /* security_tool_commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = security_tool_commands.c; sourceTree = "<group>"; };
                E710C7421331946400F85568 /* SecurityTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SecurityTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
                E710C74C1331946500F85568 /* SecurityTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SecurityTests-Info.plist"; sourceTree = "<group>"; };


@@ -13214,10 +15794,10 @@
                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecServerEncryptionSupport.h; sourceTree = "<group>"; };
                E772FD461CC15EFA00D63E41 /* NSData+SecRandom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+SecRandom.m"; sourceTree = "<group>"; };
                E772FD6F1CC15F1F00D63E41 /* NSData+SecRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+SecRandom.h"; sourceTree = "<group>"; };
                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecServerEncryptionSupport.h; sourceTree = "<group>"; };
                E772FD461CC15EFA00D63E41 /* NSData+SecRandom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+SecRandom.m"; sourceTree = "<group>"; };
                E772FD6F1CC15F1F00D63E41 /* NSData+SecRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+SecRandom.h"; sourceTree = "<group>"; };

-               E78A9AD81D34959200006B5B /* NSFileHandle+Formatting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSFileHandle+Formatting.h"; path = "../OSX/sec/SOSCircle/Tool/NSFileHandle+Formatting.h"; sourceTree = "<group>"; };
-               E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSFileHandle+Formatting.m"; path = "../OSX/sec/SOSCircle/Tool/NSFileHandle+Formatting.m"; sourceTree = "<group>"; };
-               E78CCDC61E737F6700C1CFAA /* SecNSAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecNSAdditions.m; path = src/SecNSAdditions.m; sourceTree = "<group>"; };
-               E78CCDCD1E737F8100C1CFAA /* SecNSAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecNSAdditions.h; path = src/SecNSAdditions.h; sourceTree = "<group>"; };
+               E78A9AD81D34959200006B5B /* NSFileHandle+Formatting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileHandle+Formatting.h"; sourceTree = "<group>"; };
+               E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+Formatting.m"; sourceTree = "<group>"; };
+               E78CCDC61E737F6700C1CFAA /* SecNSAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecNSAdditions.m; sourceTree = "<group>"; };
+               E78CCDCD1E737F8100C1CFAA /* SecNSAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecNSAdditions.h; sourceTree = "<group>"; };

                E794BA6E1C7424D800339A0F /* KCDer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCDer.m; sourceTree = "<group>"; };
                E794BAD91C7598E400339A0F /* KCJoiningMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KCJoiningMessages.h; sourceTree = "<group>"; };
                E794BAFF1C7598F900339A0F /* KCJoiningMessages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningMessages.m; sourceTree = "<group>"; };
                E794BA6E1C7424D800339A0F /* KCDer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCDer.m; sourceTree = "<group>"; };
                E794BAD91C7598E400339A0F /* KCJoiningMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KCJoiningMessages.h; sourceTree = "<group>"; };
                E794BAFF1C7598F900339A0F /* KCJoiningMessages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningMessages.m; sourceTree = "<group>"; };


@@ -13235,8 +15815,8 @@
                E7C787181DCA4C5A0087FC34 /* CKDLockMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDLockMonitor.h; path = KVSKeychainSyncingProxy/CKDLockMonitor.h; sourceTree = "<group>"; };
                E7C7871D1DCA4CF70087FC34 /* CKDAKSLockMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDAKSLockMonitor.h; path = KVSKeychainSyncingProxy/CKDAKSLockMonitor.h; sourceTree = "<group>"; };
                E7C7871F1DCA4D430087FC34 /* CKDAKSLockMonitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDAKSLockMonitor.m; path = KVSKeychainSyncingProxy/CKDAKSLockMonitor.m; sourceTree = "<group>"; };
                E7C787181DCA4C5A0087FC34 /* CKDLockMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDLockMonitor.h; path = KVSKeychainSyncingProxy/CKDLockMonitor.h; sourceTree = "<group>"; };
                E7C7871D1DCA4CF70087FC34 /* CKDAKSLockMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDAKSLockMonitor.h; path = KVSKeychainSyncingProxy/CKDAKSLockMonitor.h; sourceTree = "<group>"; };
                E7C7871F1DCA4D430087FC34 /* CKDAKSLockMonitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDAKSLockMonitor.m; path = KVSKeychainSyncingProxy/CKDAKSLockMonitor.m; sourceTree = "<group>"; };

-               E7C787301DD0FED50087FC34 /* NSURL+SOSPlistStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSURL+SOSPlistStore.h"; path = "src/NSURL+SOSPlistStore.h"; sourceTree = "<group>"; };
-               E7C787311DD0FED50087FC34 /* NSURL+SOSPlistStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSURL+SOSPlistStore.m"; path = "src/NSURL+SOSPlistStore.m"; sourceTree = "<group>"; };
+               E7C787301DD0FED50087FC34 /* NSURL+SOSPlistStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+SOSPlistStore.h"; sourceTree = "<group>"; };
+               E7C787311DD0FED50087FC34 /* NSURL+SOSPlistStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+SOSPlistStore.m"; sourceTree = "<group>"; };

                E7C787321DD0FED50087FC34 /* XPCNotificationDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPCNotificationDispatcher.h; path = KVSKeychainSyncingProxy/XPCNotificationDispatcher.h; sourceTree = "<group>"; };
                E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XPCNotificationDispatcher.m; path = KVSKeychainSyncingProxy/XPCNotificationDispatcher.m; sourceTree = "<group>"; };
                E7CFF7221C8660A000E3484E /* KeychainCircle.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = KeychainCircle.plist; path = Tests/KeychainCircle.plist; sourceTree = "<group>"; };
                E7C787321DD0FED50087FC34 /* XPCNotificationDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XPCNotificationDispatcher.h; path = KVSKeychainSyncingProxy/XPCNotificationDispatcher.h; sourceTree = "<group>"; };
                E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XPCNotificationDispatcher.m; path = KVSKeychainSyncingProxy/XPCNotificationDispatcher.m; sourceTree = "<group>"; };
                E7CFF7221C8660A000E3484E /* KeychainCircle.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = KeychainCircle.plist; path = Tests/KeychainCircle.plist; sourceTree = "<group>"; };


@@ -13252,44 +15832,48 @@
                E7E4318813319C0700AF0CFD /* SecurityTests-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SecurityTests-Entitlements.plist"; sourceTree = "<group>"; };
                E7F480111C729C7B00390FDB /* NSError+KCCreationHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+KCCreationHelpers.h"; sourceTree = "<group>"; };
                E7F480131C7397CE00390FDB /* KCJoiningSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KCJoiningSession.h; sourceTree = "<group>"; };
                E7E4318813319C0700AF0CFD /* SecurityTests-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SecurityTests-Entitlements.plist"; sourceTree = "<group>"; };
                E7F480111C729C7B00390FDB /* NSError+KCCreationHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+KCCreationHelpers.h"; sourceTree = "<group>"; };
                E7F480131C7397CE00390FDB /* KCJoiningSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KCJoiningSession.h; sourceTree = "<group>"; };

-               E7F480141C73980D00390FDB /* KCJoiningRequestSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningRequestSession.m; sourceTree = "<group>"; };
+               E7F480141C73980D00390FDB /* KCJoiningRequestSecretSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningRequestSecretSession.m; sourceTree = "<group>"; };

                E7F480301C73FC4C00390FDB /* KCAESGCMDuplexSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KCAESGCMDuplexSession.h; sourceTree = "<group>"; };
                E7F480311C73FC4C00390FDB /* KCAESGCMDuplexSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCAESGCMDuplexSession.m; sourceTree = "<group>"; };
                E7F4809B1C74E85200390FDB /* KCDerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCDerTest.m; path = Tests/KCDerTest.m; sourceTree = "<group>"; };
                E7F4809D1C74E86D00390FDB /* KCAESGCMTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCAESGCMTest.m; path = Tests/KCAESGCMTest.m; sourceTree = "<group>"; };
                E7F4826F1C74FDD100390FDB /* KCJoiningSessionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCJoiningSessionTest.m; path = Tests/KCJoiningSessionTest.m; sourceTree = "<group>"; };
                E7F482A21C7544E600390FDB /* libctkclient_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_test.a; path = ../../../../../usr/local/lib/libctkclient_test.a; sourceTree = "<group>"; };
                E7F480301C73FC4C00390FDB /* KCAESGCMDuplexSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KCAESGCMDuplexSession.h; sourceTree = "<group>"; };
                E7F480311C73FC4C00390FDB /* KCAESGCMDuplexSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCAESGCMDuplexSession.m; sourceTree = "<group>"; };
                E7F4809B1C74E85200390FDB /* KCDerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCDerTest.m; path = Tests/KCDerTest.m; sourceTree = "<group>"; };
                E7F4809D1C74E86D00390FDB /* KCAESGCMTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCAESGCMTest.m; path = Tests/KCAESGCMTest.m; sourceTree = "<group>"; };
                E7F4826F1C74FDD100390FDB /* KCJoiningSessionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCJoiningSessionTest.m; path = Tests/KCJoiningSessionTest.m; sourceTree = "<group>"; };
                E7F482A21C7544E600390FDB /* libctkclient_test.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkclient_test.a; path = ../../../../../usr/local/lib/libctkclient_test.a; sourceTree = "<group>"; };

-               E7F482A51C75453900390FDB /* libcoreauthd_test_client.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoreauthd_test_client.a; path = ../../../../../usr/local/lib/libcoreauthd_test_client.a; sourceTree = "<group>"; };

                E7F482A91C7554F500390FDB /* NSError+KCCreationHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+KCCreationHelpers.m"; sourceTree = "<group>"; };
                E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningAcceptSession.m; sourceTree = "<group>"; };
                E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileKeyBag.framework; path = System/Library/PrivateFrameworks/MobileKeyBag.framework; sourceTree = SDKROOT; };
                E7FCBE411314471B000DE34E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
                E7FCBE431314471B000DE34E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
                E7FCBE451314471B000DE34E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
                E7F482A91C7554F500390FDB /* NSError+KCCreationHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+KCCreationHelpers.m"; sourceTree = "<group>"; };
                E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KCJoiningAcceptSession.m; sourceTree = "<group>"; };
                E7FC30AB1332DE9000802946 /* MobileKeyBag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileKeyBag.framework; path = System/Library/PrivateFrameworks/MobileKeyBag.framework; sourceTree = SDKROOT; };
                E7FCBE411314471B000DE34E /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
                E7FCBE431314471B000DE34E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
                E7FCBE451314471B000DE34E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };

-               E7FE40C41DC804E400F0F5B6 /* CKDSimulatedStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDSimulatedStore.m; path = ../../SOSCircle/SecureObjectSync/CKDSimulatedStore.m; sourceTree = "<group>"; };
-               E7FE40C61DC804FA00F0F5B6 /* CKDSimulatedStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKDSimulatedStore.h; path = ../../SOSCircle/SecureObjectSync/CKDSimulatedStore.h; sourceTree = "<group>"; };
-               E7FE40C71DC8084600F0F5B6 /* CKDSimulatedAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDSimulatedAccount.h; path = ../../SOSCircle/Regressions/CKDSimulatedAccount.h; sourceTree = "<group>"; };
-               E7FE40C81DC8084600F0F5B6 /* CKDSimulatedAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDSimulatedAccount.m; path = ../../SOSCircle/Regressions/CKDSimulatedAccount.m; sourceTree = "<group>"; };
+               E7FE40C41DC804E400F0F5B6 /* CKDSimulatedStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDSimulatedStore.m; path = ../../SecureObjectSync/CKDSimulatedStore.m; sourceTree = "<group>"; };
+               E7FE40C61DC804FA00F0F5B6 /* CKDSimulatedStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKDSimulatedStore.h; path = ../../SecureObjectSync/CKDSimulatedStore.h; sourceTree = "<group>"; };
+               E7FE40C71DC8084600F0F5B6 /* CKDSimulatedAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDSimulatedAccount.h; path = ../../SecureObjectSync/Regressions/CKDSimulatedAccount.h; sourceTree = "<group>"; };
+               E7FE40C81DC8084600F0F5B6 /* CKDSimulatedAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDSimulatedAccount.m; path = ../../SecureObjectSync/Regressions/CKDSimulatedAccount.m; sourceTree = "<group>"; };

                E7FEFB80169E26E200E18152 /* sub_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sub_commands.h; sourceTree = "<group>"; };
                E7FEFB80169E26E200E18152 /* sub_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sub_commands.h; sourceTree = "<group>"; };

-               EB056E3E1FE5E390000A771E /* DeviceSimulator.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = DeviceSimulator.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
-               EB056E401FE5E390000A771E /* DeviceSimulatorProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeviceSimulatorProtocol.h; sourceTree = "<group>"; };
-               EB056E411FE5E390000A771E /* DeviceSimulator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeviceSimulator.h; sourceTree = "<group>"; };
-               EB056E421FE5E390000A771E /* DeviceSimulator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeviceSimulator.m; sourceTree = "<group>"; };
-               EB056E441FE5E390000A771E /* DeviceSimulatorMain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DeviceSimulatorMain.m; sourceTree = "<group>"; };
-               EB056E461FE5E391000A771E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-               EB05C4F11FE5E48A00D68712 /* MultiDeviceSimulatorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MultiDeviceSimulatorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-               EB05C4F31FE5E48B00D68712 /* MultiDeviceSimulatorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MultiDeviceSimulatorTests.m; sourceTree = "<group>"; };
-               EB05C4F51FE5E48B00D68712 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               EB056E401FE5E390000A771E /* SecRemoteDeviceProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecRemoteDeviceProtocol.h; sourceTree = "<group>"; };
+               EB056E411FE5E390000A771E /* SecRemoteDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecRemoteDevice.h; sourceTree = "<group>"; };
+               EB056E421FE5E390000A771E /* SecRemoteDevice.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecRemoteDevice.m; sourceTree = "<group>"; };
+               EB067E8A20EC873D00B7D961 /* libcompression.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcompression.tbd; path = usr/lib/libcompression.tbd; sourceTree = SDKROOT; };
+               EB093106213F8EC100C0A495 /* TestResourceUsage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestResourceUsage.h; sourceTree = "<group>"; };
+               EB093107213F8EC100C0A495 /* TestResourceUsage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestResourceUsage.m; sourceTree = "<group>"; };

                EB0BC93E1C3C791500785842 /* secedumodetest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secedumodetest; sourceTree = BUILT_PRODUCTS_DIR; };
                EB0BC9651C3C794700785842 /* secedumodetest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secedumodetest.entitlements; path = secedumodetest/secedumodetest.entitlements; sourceTree = "<group>"; };
                EB0BC9661C3C794700785842 /* secedumodetest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secedumodetest.m; path = secedumodetest/secedumodetest.m; sourceTree = "<group>"; };
                EB0BC93E1C3C791500785842 /* secedumodetest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secedumodetest; sourceTree = BUILT_PRODUCTS_DIR; };
                EB0BC9651C3C794700785842 /* secedumodetest.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secedumodetest.entitlements; path = secedumodetest/secedumodetest.entitlements; sourceTree = "<group>"; };
                EB0BC9661C3C794700785842 /* secedumodetest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secedumodetest.m; path = secedumodetest/secedumodetest.m; sourceTree = "<group>"; };

+               EB0E1AC72352A81E002B6037 /* SOSAccountConfiguration.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = SOSAccountConfiguration.proto; sourceTree = "<group>"; };
+               EB0E1AD723576273002B6037 /* CKKSPBFileStorageTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSPBFileStorageTests.m; sourceTree = "<group>"; };
+               EB0E1B922358FADE002B6037 /* SOSAccountConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSAccountConfiguration.h; sourceTree = "<group>"; };
+               EB0E1B932358FADE002B6037 /* SOSAccountConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOSAccountConfiguration.m; sourceTree = "<group>"; };

                EB10556B1E14DC0F0003C309 /* SecCertificateFuzzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCertificateFuzzer.c; sourceTree = "<group>"; };
                EB1055751E14DF430003C309 /* libSecCertificateFuzzer.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSecCertificateFuzzer.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                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; };
                EB10556B1E14DC0F0003C309 /* SecCertificateFuzzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCertificateFuzzer.c; sourceTree = "<group>"; };
                EB1055751E14DF430003C309 /* libSecCertificateFuzzer.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSecCertificateFuzzer.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
                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; };

-               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>"; };
+               EB10A3E320356E2000E84270 /* OTConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTConstants.h; sourceTree = "<group>"; };
+               EB10A3E420356E2000E84270 /* OTConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTConstants.m; sourceTree = "<group>"; };
+               EB1C319C2215EC9600A188BB /* otctl.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = otctl.1; sourceTree = "<group>"; };
+               EB1E0695211E137E0088F0B1 /* mockaksxcbase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mockaksxcbase.m; sourceTree = "<group>"; };
+               EB1E069C211E149A0088F0B1 /* mockaksxcbase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mockaksxcbase.h; sourceTree = "<group>"; };
+               EB1E069E211E17B70088F0B1 /* mockaksWatchDog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mockaksWatchDog.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>"; };
                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>"; };


@@ -13297,7 +15881,13 @@
                EB2CA5561D2C30F700AB770F /* Security.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Security.xcconfig; path = xcconfig/Security.xcconfig; sourceTree = "<group>"; };
                EB2D54A01F02A28200E46890 /* SecAtomicFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SecAtomicFile.cpp; sourceTree = "<group>"; };
                EB2D54AA1F02A45E00E46890 /* secatomicfile */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secatomicfile; sourceTree = BUILT_PRODUCTS_DIR; };
                EB2CA5561D2C30F700AB770F /* Security.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Security.xcconfig; path = xcconfig/Security.xcconfig; sourceTree = "<group>"; };
                EB2D54A01F02A28200E46890 /* SecAtomicFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SecAtomicFile.cpp; sourceTree = "<group>"; };
                EB2D54AA1F02A45E00E46890 /* secatomicfile */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secatomicfile; sourceTree = BUILT_PRODUCTS_DIR; };

+               EB35153F211A79CB0097A87C /* secd-33-keychain-backup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-33-keychain-backup.m"; sourceTree = "<group>"; };

                EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Security_edumode.plist; sourceTree = "<group>"; };
                EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Security_edumode.plist; sourceTree = "<group>"; };

+               EB3F9C9B21FCFC60007B6EBA /* OctagonTestHarness.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OctagonTestHarness.m; sourceTree = "<group>"; };
+               EB3F9C9E21FCFF8E007B6EBA /* OctagonTestHarness.exp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.exports; path = OctagonTestHarness.exp; sourceTree = "<group>"; };
+               EB3FB9B7231C12A800DF52EA /* com.apple.security.trustedpeers.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.security.trustedpeers.plist; sourceTree = "<group>"; };
+               EB3FBBF42320629400DF52EA /* SecABC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecABC.h; sourceTree = "<group>"; };
+               EB3FBBF52320629400DF52EA /* SecABC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecABC.m; sourceTree = "<group>"; };

                EB413B751E6624A400592085 /* PairingChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PairingChannel.h; sourceTree = "<group>"; };
                EB413B761E6624A500592085 /* PairingChannel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PairingChannel.m; sourceTree = "<group>"; };
                EB413B7E1E663A8300592085 /* KCPairingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCPairingTest.m; path = Tests/KCPairingTest.m; sourceTree = "<group>"; };
                EB413B751E6624A400592085 /* PairingChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PairingChannel.h; sourceTree = "<group>"; };
                EB413B761E6624A500592085 /* PairingChannel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PairingChannel.m; sourceTree = "<group>"; };
                EB413B7E1E663A8300592085 /* KCPairingTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KCPairingTest.m; path = Tests/KCPairingTest.m; sourceTree = "<group>"; };


@@ -13307,9 +15897,14 @@
                EB433A1E1CC3242C00A7EACE /* secitemstresstest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secitemstresstest.m; path = secitemstresstest/secitemstresstest.m; 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>"; };
                EB433A1E1CC3242C00A7EACE /* secitemstresstest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secitemstresstest.m; path = secitemstresstest/secitemstresstest.m; 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>"; };

+               EB45ED2E24749DE9008A1F6F /* gen_test_plist.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = gen_test_plist.py; path = tests/TrustTests/gen_test_plist.py; sourceTree = "<group>"; };
+               EB45ED3024749E63008A1F6F /* gen_test_plist.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = gen_test_plist.py; sourceTree = "<group>"; };
+               EB45ED3124749ECC008A1F6F /* OTTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OTTests-Info.plist"; sourceTree = "<group>"; };
+               EB45ED3224749ECC008A1F6F /* gen_test_plist.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = gen_test_plist.py; sourceTree = "<group>"; };

                EB48C19E1E573EDC00EC5E57 /* sos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sos.m; sourceTree = "<group>"; };
                EB48C19E1E573EDC00EC5E57 /* sos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sos.m; sourceTree = "<group>"; };

+               EB490153211C0026001E6D6A /* UserManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserManagement.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/UserManagement.framework; sourceTree = DEVELOPER_DIR; };

                EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = secdmockaks.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                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>"; };
+               EB49B2B0202D8780003F34A0 /* mockaksKeychain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mockaksKeychain.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; };
                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; };


@@ -13320,20 +15915,76 @@
                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>"; };
                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>"; };

+               EB627A6F233E323600F32437 /* MockAKSOptionalParameters.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = MockAKSOptionalParameters.proto; sourceTree = "<group>"; };
+               EB627A75233E342800F32437 /* MockAKSRefKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockAKSRefKey.m; sourceTree = "<group>"; };
+               EB627A76233E342900F32437 /* MockAKSRefKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockAKSRefKey.h; sourceTree = "<group>"; };
+               EB627A77233E342B00F32437 /* MockAKSOptionalParameters.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockAKSOptionalParameters.m; sourceTree = "<group>"; };
+               EB627A78233E342B00F32437 /* MockAKSOptionalParameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockAKSOptionalParameters.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>"; };
                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>"; };

+               EB6952B9223B75C300F02C1C /* secitemd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemd; sourceTree = BUILT_PRODUCTS_DIR; };
+               EB6952BC223B783500F02C1C /* com.apple.secitemd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.secitemd.plist; sourceTree = "<group>"; };

                EB69AB091BF4347700913AF1 /* SecEMCSPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecEMCSPriv.h; sourceTree = "<group>"; };
                EB69AB091BF4347700913AF1 /* SecEMCSPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecEMCSPriv.h; sourceTree = "<group>"; };

+               EB6AC0AA22F22E80003F067B /* SecTapToRadarTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecTapToRadarTests.m; sourceTree = "<group>"; };
+               EB6D1D5322FE8D3000205E83 /* SecItemTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecItemTests.m; sourceTree = "<group>"; };
+               EB71CF6322E8238000DA3D0E /* SecTapToRadar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTapToRadar.h; sourceTree = "<group>"; };
+               EB71CF6422E8238000DA3D0E /* SecTapToRadar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecTapToRadar.m; sourceTree = "<group>"; };
+               EB74CC162207E48000F1BBAD /* KeychainSettings.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KeychainSettings.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+               EB74CC192207E48100F1BBAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               EB74CC1D2207E4BA00F1BBAD /* KeychainSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainSettings.h; sourceTree = "<group>"; };
+               EB74CC1E2207E4BA00F1BBAD /* KeychainSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeychainSettings.m; sourceTree = "<group>"; };
+               EB74CC212207E4FA00F1BBAD /* KeychainSettings.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = KeychainSettings.plist; sourceTree = "<group>"; };
+               EB74CC252207ECCB00F1BBAD /* Preferences.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Preferences.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/System/Library/PrivateFrameworks/Preferences.framework; sourceTree = DEVELOPER_DIR; };
+               EB74CC2E2207FBE900F1BBAD /* KeychainSettingsOctagonPeers.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = KeychainSettingsOctagonPeers.plist; sourceTree = "<group>"; };

                EB75B4931E75A44100E469CC /* SOSPiggyback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPiggyback.h; sourceTree = "<group>"; };
                EB75B4941E75A44100E469CC /* SOSPiggyback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSPiggyback.m; sourceTree = "<group>"; };
                EB76B75A1DCB0CDA00C43FBC /* Keychain Circle Notification.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Keychain Circle Notification.8"; sourceTree = "<group>"; };
                EB75B4931E75A44100E469CC /* SOSPiggyback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPiggyback.h; sourceTree = "<group>"; };
                EB75B4941E75A44100E469CC /* SOSPiggyback.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SOSPiggyback.m; sourceTree = "<group>"; };
                EB76B75A1DCB0CDA00C43FBC /* Keychain Circle Notification.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Keychain Circle Notification.8"; sourceTree = "<group>"; };

-               EB7AE6F61E86D55400B80B15 /* SecPLWrappers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SecPLWrappers.m; path = src/SecPLWrappers.m; sourceTree = "<group>"; };
-               EB7AE6F71E86D55400B80B15 /* SecPLWrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SecPLWrappers.h; path = src/SecPLWrappers.h; sourceTree = "<group>"; };
+               EB7732DA21963BAD00FCF513 /* libz.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.tbd; path = usr/lib/libz.1.tbd; sourceTree = SDKROOT; };
+               EB7AE6F61E86D55400B80B15 /* SecPLWrappers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecPLWrappers.m; sourceTree = "<group>"; };
+               EB7AE6F71E86D55400B80B15 /* SecPLWrappers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPLWrappers.h; sourceTree = "<group>"; };
+               EB7E90EB2193A54100B1FA21 /* SecMetrics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecMetrics.h; sourceTree = "<group>"; };
+               EB7E90EC2193A54100B1FA21 /* SecMetrics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecMetrics.m; sourceTree = "<group>"; };
+               EB7E90EF2193A56C00B1FA21 /* C2Metric.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = C2Metric.proto; sourceTree = "<group>"; };
+               EB7E90F72193F96F00B1FA21 /* SECC2MPMetric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPMetric.h; sourceTree = "<group>"; };
+               EB7E90F82193F96F00B1FA21 /* SECC2MPGenericEventMetric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPGenericEventMetric.h; sourceTree = "<group>"; };
+               EB7E90F92193F97000B1FA21 /* SECC2MPDeviceInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPDeviceInfo.m; sourceTree = "<group>"; };
+               EB7E90FA2193F97000B1FA21 /* SECC2MPInternalTestConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPInternalTestConfig.m; sourceTree = "<group>"; };
+               EB7E90FB2193F97000B1FA21 /* SECC2MPDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPDeviceInfo.h; sourceTree = "<group>"; };
+               EB7E90FC2193F97100B1FA21 /* SECC2MPCloudKitOperationInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPCloudKitOperationInfo.m; sourceTree = "<group>"; };
+               EB7E90FD2193F97100B1FA21 /* SECC2MPError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPError.m; sourceTree = "<group>"; };
+               EB7E90FE2193F97200B1FA21 /* SECC2MPGenericEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPGenericEvent.h; sourceTree = "<group>"; };
+               EB7E90FF2193F97200B1FA21 /* SECC2MPGenericEventMetric.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPGenericEventMetric.m; sourceTree = "<group>"; };
+               EB7E91002193F97200B1FA21 /* SECC2MPGenericEventMetricValue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPGenericEventMetricValue.h; sourceTree = "<group>"; };
+               EB7E91012193F97300B1FA21 /* SECC2MPInternalTestConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPInternalTestConfig.h; sourceTree = "<group>"; };
+               EB7E91022193F97300B1FA21 /* SECC2MPGenericEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPGenericEvent.m; sourceTree = "<group>"; };
+               EB7E91032193F97400B1FA21 /* SECC2MPCloudKitOperationGroupInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPCloudKitOperationGroupInfo.h; sourceTree = "<group>"; };
+               EB7E91042193F97400B1FA21 /* SECC2MPCloudKitInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPCloudKitInfo.m; sourceTree = "<group>"; };
+               EB7E91052193F97400B1FA21 /* SECC2MPMetric.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPMetric.m; sourceTree = "<group>"; };
+               EB7E91062193F97500B1FA21 /* SECC2MPCloudKitOperationGroupInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPCloudKitOperationGroupInfo.m; sourceTree = "<group>"; };
+               EB7E91072193F97500B1FA21 /* SECC2MPNetworkEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPNetworkEvent.m; sourceTree = "<group>"; };
+               EB7E91082193F97600B1FA21 /* SECC2MPServerInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPServerInfo.h; sourceTree = "<group>"; };
+               EB7E91092193F97600B1FA21 /* SECC2MPCloudKitInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPCloudKitInfo.h; sourceTree = "<group>"; };
+               EB7E910A2193F97600B1FA21 /* SECC2MPGenericEventMetricValue.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPGenericEventMetricValue.m; sourceTree = "<group>"; };
+               EB7E910B2193F97700B1FA21 /* SECC2MPServerInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SECC2MPServerInfo.m; sourceTree = "<group>"; };
+               EB7E910C2193F97700B1FA21 /* SECC2MPError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPError.h; sourceTree = "<group>"; };
+               EB7E910D2193F97800B1FA21 /* SECC2MPCloudKitOperationInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPCloudKitOperationInfo.h; sourceTree = "<group>"; };
+               EB7E910E2193F97800B1FA21 /* SECC2MPNetworkEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SECC2MPNetworkEvent.h; sourceTree = "<group>"; };
+               EB7E910F2193FB7E00B1FA21 /* SecC2DeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecC2DeviceInfo.h; sourceTree = "<group>"; };
+               EB7E91102193FB7E00B1FA21 /* SecC2DeviceInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecC2DeviceInfo.m; sourceTree = "<group>"; };
+               EB7E91112194826F00B1FA21 /* SecEventMetric.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecEventMetric.h; sourceTree = "<group>"; };
+               EB7E91122194826F00B1FA21 /* SecEventMetric.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecEventMetric.m; sourceTree = "<group>"; };
+               EB7E91242194915600B1FA21 /* SecEventMetric_private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecEventMetric_private.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>"; };
                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>"; };
+               EB80DE57219600CF005B10FA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
+               EB89088621F17D3C00F0DDDB /* recovery_securityd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = recovery_securityd; sourceTree = BUILT_PRODUCTS_DIR; };
+               EB8908BB21F20E0200F0DDDB /* com.apple.recovery_securityd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = com.apple.recovery_securityd.plist; sourceTree = "<group>"; };
+               EB89111020E3C15D00DE533F /* UserManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserManagement.framework; path = System/Library/PrivateFrameworks/UserManagement.framework; sourceTree = SDKROOT; };
+               EB97364F234E8F4A00518B2B /* CKKSPBFileStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKKSPBFileStorage.h; path = keychain/ckks/CKKSPBFileStorage.h; sourceTree = SOURCE_ROOT; };
+               EB973650234E8F4B00518B2B /* CKKSPBFileStorage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CKKSPBFileStorage.m; path = keychain/ckks/CKKSPBFileStorage.m; sourceTree = SOURCE_ROOT; };
+               EB9795B422FE90E6002BDBFB /* SecurityUnitTests.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SecurityUnitTests.entitlements; 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>"; };
                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>"; };


@@ -13341,45 +15992,62 @@
                EBA9AA7B1CE30CE7004E2B68 /* secitemnotifications.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secitemnotifications.entitlements; path = secitemnotifications/secitemnotifications.entitlements; sourceTree = "<group>"; };
                EBA9AA7C1CE30CE7004E2B68 /* secitemnotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secitemnotifications.m; path = secitemnotifications/secitemnotifications.m; sourceTree = "<group>"; };
                EBA9AA861CE30E58004E2B68 /* secitemnotifications */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemnotifications; sourceTree = BUILT_PRODUCTS_DIR; };
                EBA9AA7B1CE30CE7004E2B68 /* secitemnotifications.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = secitemnotifications.entitlements; path = secitemnotifications/secitemnotifications.entitlements; sourceTree = "<group>"; };
                EBA9AA7C1CE30CE7004E2B68 /* secitemnotifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = secitemnotifications.m; path = secitemnotifications/secitemnotifications.m; sourceTree = "<group>"; };
                EBA9AA861CE30E58004E2B68 /* secitemnotifications */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secitemnotifications; sourceTree = BUILT_PRODUCTS_DIR; };

-               EBB407AF1EBA433A00A541A5 /* CKKSPowerCollection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CKKSPowerCollection.h; path = analytics/CKKSPowerCollection.h; sourceTree = "<group>"; };
-               EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CKKSPowerCollection.m; path = analytics/CKKSPowerCollection.m; sourceTree = "<group>"; };
+               EBAC4A512189743D00FBEC43 /* rio.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rio.yml; sourceTree = "<group>"; };
+               EBB02A56221FF362007241CB /* KeychainSettingsCKKSViews.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = KeychainSettingsCKKSViews.plist; sourceTree = "<group>"; };
+               EBB02A6C2220ED16007241CB /* CKKSLaunchSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSLaunchSequence.h; sourceTree = "<group>"; };
+               EBB02A6D2220ED16007241CB /* CKKSLaunchSequence.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLaunchSequence.m; sourceTree = "<group>"; };
+               EBB03155222237A7007241CB /* CKKSLaunchSequenceTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSLaunchSequenceTests.m; sourceTree = "<group>"; };
+               EBB407AF1EBA433A00A541A5 /* CKKSPowerCollection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSPowerCollection.h; sourceTree = "<group>"; };
+               EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSPowerCollection.m; sourceTree = "<group>"; };

                EBB8399B1E295B8F00853BAC /* secfuzzer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secfuzzer.m; sourceTree = "<group>"; };
                EBB839A51E29665D00853BAC /* secfuzzer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secfuzzer; sourceTree = BUILT_PRODUCTS_DIR; };
                EBB8399B1E295B8F00853BAC /* secfuzzer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = secfuzzer.m; sourceTree = "<group>"; };
                EBB839A51E29665D00853BAC /* secfuzzer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = secfuzzer; sourceTree = BUILT_PRODUCTS_DIR; };

+               EBB851EC22F7912400424FD0 /* SecurityUtilitiesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SecurityUtilitiesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+               EBB8521A22F7943700424FD0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+               EBC1023022EBF8AC0083D356 /* CKKSTests+LockStateTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "CKKSTests+LockStateTracker.m"; sourceTree = "<group>"; };

                EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.secd.sb; sourceTree = "<group>"; };
                EBC73F4A209A0BEF00AE3350 /* install-test-framework.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "install-test-framework.sh"; path = "xcscripts/install-test-framework.sh"; sourceTree = "<group>"; };
                EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.secd.sb; sourceTree = "<group>"; };
                EBC73F4A209A0BEF00AE3350 /* install-test-framework.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "install-test-framework.sh"; path = "xcscripts/install-test-framework.sh"; sourceTree = "<group>"; };

-               EBCE165C1FE6F4CE002E7CCC /* DeviceSimulator-Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "DeviceSimulator-Entitlements.plist"; sourceTree = "<group>"; };
-               EBCE165E1FE7313C002E7CCC /* MultiDeviceNetworking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MultiDeviceNetworking.h; sourceTree = "<group>"; };
-               EBCE165F1FE7313C002E7CCC /* MultiDeviceNetworking.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MultiDeviceNetworking.m; sourceTree = "<group>"; };
-               EBCE16611FE73327002E7CCC /* MultiDeviceNetworkingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MultiDeviceNetworkingProtocol.h; sourceTree = "<group>"; };
+               EBCE06E521C6E26000FB1493 /* OTDefines.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OTDefines.m; sourceTree = "<group>"; };

                EBCF01001DF501310055AF97 /* swcagent-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "swcagent-entitlements.plist"; 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>"; };
                EBCF01001DF501310055AF97 /* swcagent-entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "swcagent-entitlements.plist"; 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>"; };

+               EBDAA7E320EC46CF003EA6E5 /* SecurityLocalKeychain.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SecurityLocalKeychain.plist; sourceTree = "<group>"; };
+               EBDAF15B21C75FF200EAE89F /* NSXPCConnectionMock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSXPCConnectionMock.h; sourceTree = "<group>"; };
+               EBDAF15C21C75FF200EAE89F /* NSXPCConnectionMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NSXPCConnectionMock.m; sourceTree = "<group>"; };
+               EBDCBFFE233DD31700806566 /* MockAKSRefKey.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = MockAKSRefKey.proto; sourceTree = "<group>"; };
+               EBDE5DF922BA3D5D00A229C8 /* CKKSMockOctagonAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CKKSMockOctagonAdapter.h; sourceTree = "<group>"; };
+               EBDE5DFA22BA3D5D00A229C8 /* CKKSMockOctagonAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CKKSMockOctagonAdapter.m; sourceTree = "<group>"; };
+               EBE2026420908A8A00B48020 /* tpctl.8 */ = {isa = PBXFileReference; lastKnownFileType = text; path = tpctl.8; sourceTree = "<group>"; };

                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SecurityInduceLowDisk.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>"; };
                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = SecurityInduceLowDisk.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>"; };

+               EBE8258E2193353300102304 /* SecCoreAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecCoreAnalytics.h; sourceTree = "<group>"; };
+               EBE8258F2193353300102304 /* SecCoreAnalytics.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SecCoreAnalytics.m; 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; };
                EBF374721DC055580065D840 /* security-sysdiagnose */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "security-sysdiagnose"; sourceTree = BUILT_PRODUCTS_DIR; };
                EBF374741DC055590065D840 /* security-sysdiagnose.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "security-sysdiagnose.m"; sourceTree = "<group>"; };
                EBF3747F1DC057FE0065D840 /* security-sysdiagnose.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = "security-sysdiagnose.1"; 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; };
                EBF374721DC055580065D840 /* security-sysdiagnose */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "security-sysdiagnose"; sourceTree = BUILT_PRODUCTS_DIR; };
                EBF374741DC055590065D840 /* security-sysdiagnose.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "security-sysdiagnose.m"; sourceTree = "<group>"; };
                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; };
                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; };

+               F681C3A82386B8B40083F22C /* PreloginUserDb.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreloginUserDb.m; path = OSX/authd/PreloginUserDb.m; sourceTree = "<group>"; };
+               F681C3AA2386B8B40083F22C /* PreloginUserDb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreloginUserDb.h; path = OSX/authd/PreloginUserDb.h; sourceTree = "<group>"; };

                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>"; };
                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>"; };

-               F93C493A1AB8FF530047E01A /* ckcdiagnose.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ckcdiagnose.sh; sourceTree = "<group>"; };
+               F6B1B48924144B5E00CB3E3F /* libctkloginhelperlite.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libctkloginhelperlite.a; path = usr/local/lib/libctkloginhelperlite.a; sourceTree = SDKROOT; };
+               F6D600702166551800F9F7C9 /* AuthorizationTrampolinePriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AuthorizationTrampolinePriv.h; path = OSX/libsecurity_authorization/lib/AuthorizationTrampolinePriv.h; sourceTree = "<group>"; };

                F9B458272183E01100F6BCEB /* SignatureEditing.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = SignatureEditing.sh; path = OSX/codesign_tests/SignatureEditing.sh; sourceTree = "<group>"; };
                F9B458272183E01100F6BCEB /* SignatureEditing.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = SignatureEditing.sh; path = OSX/codesign_tests/SignatureEditing.sh; sourceTree = "<group>"; };

-               F9C8AFC5223740C700E7D6AE /* requirement.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = requirement.c; sourceTree = "<group>"; };
-               F9C8AFCB223740C800E7D6AE /* requirement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = requirement.h; sourceTree = "<group>"; };
+               F9F77E96223C2F7B00E5CBF6 /* requirement.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = requirement.c; sourceTree = "<group>"; };
+               F9F77E97223C2F7C00E5CBF6 /* requirement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = requirement.h; sourceTree = "<group>"; };
+               FC637229237B5CF800973738 /* SecItemServer+SWC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SecItemServer+SWC.h"; sourceTree = "<group>"; };
+               FC63722A237B5CF900973738 /* SecItemServer+SWC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SecItemServer+SWC.m"; sourceTree = "<group>"; };

 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */


@@ -13387,6 +16055,11 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D47AB2D22356B325005A3801 /* Network.framework in Frameworks */,
+                               DCF46572220114E400BA6EEA /* CloudServices.framework in Frameworks */,
+                               EB80DE55219600BF005B10FA /* libz.tbd in Frameworks */,
+                               DC9C066E2149E35F00C6F7B8 /* AuthKit.framework in Frameworks */,
+                               D42C838B21158EF4008D3D83 /* libCMS.a in Frameworks */,

                                474B5FC71E662E67007546F8 /* SecurityFoundation.framework in Frameworks */,
                                6C8CC3B61E2F98C2009025C5 /* ProtocolBuffer.framework in Frameworks */,
                                D40B6A8D1E2B63D900CD6EE5 /* libtrustd.a in Frameworks */,
                                474B5FC71E662E67007546F8 /* SecurityFoundation.framework in Frameworks */,
                                6C8CC3B61E2F98C2009025C5 /* ProtocolBuffer.framework in Frameworks */,
                                D40B6A8D1E2B63D900CD6EE5 /* libtrustd.a in Frameworks */,


@@ -13394,8 +16067,7 @@
                                DCD22D8D1D8CCC79001C9B81 /* libregressionBase.a in Frameworks */,
                                438168C51B4ED43B00C54D58 /* CoreFoundation.framework in Frameworks */,
                                EB3409B01C1D627400D77661 /* Foundation.framework in Frameworks */,
                                DCD22D8D1D8CCC79001C9B81 /* libregressionBase.a in Frameworks */,
                                438168C51B4ED43B00C54D58 /* CoreFoundation.framework in Frameworks */,
                                EB3409B01C1D627400D77661 /* Foundation.framework in Frameworks */,

-                               DCD22D8B1D8CCC58001C9B81 /* libASN1_not_installed.a in Frameworks */,
-                               DC59E9A71D91C7C7001BDDF5 /* libCMS.a in Frameworks */,
+                               DCD22D8B1D8CCC58001C9B81 /* libASN1.a in Frameworks */,

                                D491116C2095594A0066A1E4 /* CoreData.framework in Frameworks */,
                                DC00ABD71D821F3F00513D74 /* libsecurity.a in Frameworks */,
                                DC00ABD81D821F4300513D74 /* libsecdRegressions.a in Frameworks */,
                                D491116C2095594A0066A1E4 /* CoreData.framework in Frameworks */,
                                DC00ABD71D821F3F00513D74 /* libsecurity.a in Frameworks */,
                                DC00ABD81D821F4300513D74 /* libsecdRegressions.a in Frameworks */,


@@ -13410,11 +16082,11 @@
                                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */,
                                D46246B81F9AE77900D63882 /* libDER.a in Frameworks */,
                                5E8B53A51AA0B8A600345E7B /* libcoreauthd_test_client.a 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 */,
                                4469FBFF1AA0A4820021AA26 /* libctkclient_test.a in Frameworks */,
                                0C0BDB8F1756A6D500BC1A7E /* libMobileGestalt.dylib in Frameworks */,
                                0C0BDB881756A51000BC1A7E /* libsqlite3.dylib in Frameworks */,
                                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */,
                                4469FBFF1AA0A4820021AA26 /* libctkclient_test.a in Frameworks */,

+                               DA53FC4523A9C801002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13442,8 +16114,10 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C85DFE71FB38BB6000343A7 /* libASN1_not_installed.a in Frameworks */,
-                               0C85DFE81FB38BB6000343A7 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
+                               DC6013392147227800863C1A /* libsecurityd_ios.a in Frameworks */,
+                               DCCFB14F21239534003D2DA2 /* libaks_mock.a in Frameworks */,
+                               0C7A8BC021714D0E00F4C480 /* AuthKit.framework in Frameworks */,
+                               0C85DFE71FB38BB6000343A7 /* libASN1.a in Frameworks */,

                                0C85DFE91FB38BB6000343A7 /* libSecureObjectSyncFramework.a in Frameworks */,
                                0C85DFEA1FB38BB6000343A7 /* libSecureObjectSyncServer.a in Frameworks */,
                                0C85DFEB1FB38BB6000343A7 /* libsecurity.a in Frameworks */,
                                0C85DFE91FB38BB6000343A7 /* libSecureObjectSyncFramework.a in Frameworks */,
                                0C85DFEA1FB38BB6000343A7 /* libSecureObjectSyncServer.a in Frameworks */,
                                0C85DFEB1FB38BB6000343A7 /* libsecurity.a in Frameworks */,


@@ -13459,6 +16133,7 @@
                                0C85DFF61FB38BB6000343A7 /* libDER.a in Frameworks */,
                                0C85DFF71FB38BB6000343A7 /* libbsm.dylib in Frameworks */,
                                D491116E209559510066A1E4 /* CoreData.framework in Frameworks */,
                                0C85DFF61FB38BB6000343A7 /* libDER.a in Frameworks */,
                                0C85DFF71FB38BB6000343A7 /* libbsm.dylib in Frameworks */,
                                D491116E209559510066A1E4 /* CoreData.framework in Frameworks */,

+                               0CE780A321421C730049340E /* libcompression.tbd in Frameworks */,

                                0C85DFF81FB38BB6000343A7 /* libcoreauthd_client.a in Frameworks */,
                                0C85DFF91FB38BB6000343A7 /* libctkclient_sep.a in Frameworks */,
                                0C85DFFA1FB38BB6000343A7 /* libsqlite3.0.dylib in Frameworks */,
                                0C85DFF81FB38BB6000343A7 /* libcoreauthd_client.a in Frameworks */,
                                0C85DFF91FB38BB6000343A7 /* libctkclient_sep.a in Frameworks */,
                                0C85DFFA1FB38BB6000343A7 /* libsqlite3.0.dylib in Frameworks */,


@@ -13470,24 +16145,38 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C8BBF031FCB446400580909 /* Security.framework in Frameworks */,
+                               0C3810F123EF6FC4002D7E19 /* OctagonTrust.framework in Frameworks */,
+                               0C84D83D1FCF449700B822E3 /* Security.framework in Frameworks */,
+                               0CE902352395D0A3005E3F8C /* AuthKit.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               0C9AEEB020783FBB00BF6237 /* Frameworks */ = {
+               0CCC226123F357EE00E1FCD0 /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C9AEEBB20783FF900BF6237 /* Security.framework in Frameworks */,
+                               0CCC22B323F38B6D00E1FCD0 /* AuthKit.framework in Frameworks */,
+                               0CCC22B623F38BCD00E1FCD0 /* CoreData.framework in Frameworks */,
+                               0CCC22C723F3904D00E1FCD0 /* Foundation.framework in Frameworks */,
+                               0C570B7C23F3A0E3001FEB3B /* IOKit.framework in Frameworks */,
+                               0CCC22C823F390E400E1FCD0 /* OCMock.framework in Frameworks */,
+                               0CCC22A423F374EB00E1FCD0 /* OctagonTrust.framework in Frameworks */,
+                               0CCC22AE23F38B2D00E1FCD0 /* SystemConfiguration.framework in Frameworks */,
+                               0CCC22A923F38AFD00E1FCD0 /* libSecureObjectSyncServer.a in Frameworks */,
+                               0CCC22A823F38AD600E1FCD0 /* libsecurityd_ios.a in Frameworks */,
+                               0CCC22A523F3763C00E1FCD0 /* libutilities.a in Frameworks */,
+                               0CCC22BD23F38D4B00E1FCD0 /* libbsm.tbd in Frameworks */,
+                               0CCC22BC23F38D3500E1FCD0 /* libz.tbd in Frameworks */,
+                               0CCC22B223F38B5B00E1FCD0 /* libsqlite3.0.tbd in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               0CF406342072E3E3003D6A7F /* Frameworks */ = {
+               0CD743A323C3EC8000FA0EC5 /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C5663EF20BE2E220035F362 /* libutilities.a in Frameworks */,
-                               0C9AEEBE207843D000BF6237 /* Security.framework in Frameworks */,
+                               0CCC21FF23F3577A00E1FCD0 /* Security.framework in Frameworks */,
+                               0CD743AF23C3ECEB00FA0EC5 /* ProtocolBuffer.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13498,17 +16187,26 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               3D58393E21890FFB000ACA44 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3D55EA832242F50B008E7459 /* Security.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                3DD1FF2F201C07F30086D049 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                3DD1FF2F201C07F30086D049 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               5AA465E12229A40400C068F4 /* Security.framework in Frameworks */,
+                               AAD6630A203362490073E17B /* libnetwork.tbd in Frameworks */,

                                3DD1FFAA201FC5C30086D049 /* libcoretls.tbd in Frameworks */,
                                3DD1FFAB201FC5C30086D049 /* libcoretls_cfhelpers.tbd in Frameworks */,
                                3DD1FFA7201FC5B90086D049 /* Foundation.framework in Frameworks */,
                                3DD1FFA5201FC59D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFA4201FC58F0086D049 /* libutilities.a in Frameworks */,
                                3DD1FFA3201FC5870086D049 /* libDiagnosticMessagesClient.tbd in Frameworks */,
                                3DD1FFAA201FC5C30086D049 /* libcoretls.tbd in Frameworks */,
                                3DD1FFAB201FC5C30086D049 /* libcoretls_cfhelpers.tbd in Frameworks */,
                                3DD1FFA7201FC5B90086D049 /* Foundation.framework in Frameworks */,
                                3DD1FFA5201FC59D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFA4201FC58F0086D049 /* libutilities.a in Frameworks */,
                                3DD1FFA3201FC5870086D049 /* libDiagnosticMessagesClient.tbd in Frameworks */,

-                               3DD1FFA2201FC5800086D049 /* SecurityFoundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13516,13 +16214,31 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               3DD1FFD2201FDCA80086D049 /* Security.framework in Frameworks */,
+                               AAA5FC7E21664D1D00B52A48 /* Security.framework in Frameworks */,
+                               AAD6630B203362500073E17B /* libnetwork.tbd in Frameworks */,

                                3DD1FFC4201FDB1D0086D049 /* libcoretls.tbd in Frameworks */,
                                3DD1FFC5201FDB1D0086D049 /* libcoretls_cfhelpers.tbd in Frameworks */,
                                3DD1FFC6201FDB1D0086D049 /* Foundation.framework in Frameworks */,
                                3DD1FFC8201FDB1D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFC9201FDB1D0086D049 /* libutilities.a in Frameworks */,
                                3DD1FFC4201FDB1D0086D049 /* libcoretls.tbd in Frameworks */,
                                3DD1FFC5201FDB1D0086D049 /* libcoretls_cfhelpers.tbd in Frameworks */,
                                3DD1FFC6201FDB1D0086D049 /* Foundation.framework in Frameworks */,
                                3DD1FFC8201FDB1D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFC9201FDB1D0086D049 /* libutilities.a in Frameworks */,

-                               3DD1FFCB201FDB1D0086D049 /* SecurityFoundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               3E4D49B62531170600B124B3 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3E4D49B72531170600B124B3 /* Security.framework in Frameworks */,
+                               3E4D49B82531170600B124B3 /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               3E88360B24F068EF00E9F4D6 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3E88361B24F08DA100E9F4D6 /* Security.framework in Frameworks */,
+                               3E88360D24F068EF00E9F4D6 /* Foundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13530,9 +16246,11 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               EB86BEF6222C3C0500EC0F13 /* AppleAccount.framework in Frameworks */,

                                438169E41B4EE13B00C54D58 /* Accounts.framework in Frameworks */,
                                438169E51B4EE14D00C54D58 /* Security.framework in Frameworks */,
                                4381690D1B4EDCBD00C54D58 /* Foundation.framework in Frameworks */,
                                438169E41B4EE13B00C54D58 /* Accounts.framework in Frameworks */,
                                438169E51B4EE14D00C54D58 /* Security.framework in Frameworks */,
                                4381690D1B4EDCBD00C54D58 /* Foundation.framework in Frameworks */,

+                               DA2F592723A99F2900C30285 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13549,13 +16267,13 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               6CD1DBED21F9281D00D158FB /* SecurityFoundation.framework in Frameworks */,

                                4718AEE7205B3A420068EC3F /* libsecurityd_bridge.a in Frameworks */,
                                4718AE19205B39620068EC3F /* libMobileGestalt.dylib in Frameworks */,
                                4718AE1A205B39620068EC3F /* Foundation.framework in Frameworks */,
                                4718AE1B205B39620068EC3F /* libutilities.a in Frameworks */,
                                4718AE1C205B39620068EC3F /* CoreFoundation.framework in Frameworks */,
                                4718AE1E205B39620068EC3F /* libSecureObjectSyncServer.a in Frameworks */,
                                4718AEE7205B3A420068EC3F /* libsecurityd_bridge.a in Frameworks */,
                                4718AE19205B39620068EC3F /* libMobileGestalt.dylib in Frameworks */,
                                4718AE1A205B39620068EC3F /* Foundation.framework in Frameworks */,
                                4718AE1B205B39620068EC3F /* libutilities.a in Frameworks */,
                                4718AE1C205B39620068EC3F /* CoreFoundation.framework in Frameworks */,
                                4718AE1E205B39620068EC3F /* libSecureObjectSyncServer.a in Frameworks */,

-                               4718AE1F205B39620068EC3F /* libSecureObjectSyncFramework.a in Frameworks */,

                                4718AE20205B39620068EC3F /* libSWCAgent.a in Frameworks */,
                                4718AE21205B39620068EC3F /* Security.framework in Frameworks */,
                                D491116B2095593E0066A1E4 /* CoreData.framework in Frameworks */,
                                4718AE20205B39620068EC3F /* libSWCAgent.a in Frameworks */,
                                4718AE21205B39620068EC3F /* Security.framework in Frameworks */,
                                D491116B2095593E0066A1E4 /* CoreData.framework in Frameworks */,


@@ -13563,6 +16281,7 @@
                                4718AE23205B39620068EC3F /* IOKit.framework in Frameworks */,
                                4718AE24205B39620068EC3F /* libaks_acl.a in Frameworks */,
                                4718AE25205B39620068EC3F /* libsqlite3.dylib in Frameworks */,
                                4718AE23205B39620068EC3F /* IOKit.framework in Frameworks */,
                                4718AE24205B39620068EC3F /* libaks_acl.a in Frameworks */,
                                4718AE25205B39620068EC3F /* libsqlite3.dylib in Frameworks */,

+                               DA2F592523A99E8400C30285 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13577,6 +16296,9 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DC4A76AB221269B8006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB7732D921963BA500FCF513 /* libz.dylib in Frameworks */,
+                               482FE56E2177CF340031C11E /* AuthKit.framework in Frameworks */,

                                479231F02065C52D00B2718C /* Security.framework in Frameworks */,
                                479231EF2065C52200B2718C /* libsecurity.a in Frameworks */,
                                479231E82065B31300B2718C /* libsecurityd_ios.a in Frameworks */,
                                479231F02065C52D00B2718C /* Security.framework in Frameworks */,
                                479231EF2065C52200B2718C /* libsecurity.a in Frameworks */,
                                479231E82065B31300B2718C /* libsecurityd_ios.a in Frameworks */,


@@ -13595,12 +16317,12 @@
                                4727FBD51F9920510003AE36 /* ProtocolBuffer.framework in Frameworks */,
                                D4911172209559630066A1E4 /* CoreData.framework in Frameworks */,
                                4727FBD31F9920290003AE36 /* CloudKit.framework in Frameworks */,
                                4727FBD51F9920510003AE36 /* ProtocolBuffer.framework in Frameworks */,
                                D4911172209559630066A1E4 /* CoreData.framework in Frameworks */,
                                4727FBD31F9920290003AE36 /* CloudKit.framework in Frameworks */,

-                               4727FBD11F991F990003AE36 /* libMobileGestalt.dylib in Frameworks */,

                                4727FBCE1F991F820003AE36 /* SecurityFoundation.framework in Frameworks */,
                                4727FBCD1F991F660003AE36 /* libsqlite3.dylib in Frameworks */,
                                4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */,
                                4727FBC61F991DE90003AE36 /* libsecdRegressions.a in Frameworks */,
                                4727FBC51F991C470003AE36 /* Foundation.framework in Frameworks */,
                                4727FBCE1F991F820003AE36 /* SecurityFoundation.framework in Frameworks */,
                                4727FBCD1F991F660003AE36 /* libsqlite3.dylib in Frameworks */,
                                4727FBC91F991E5A0003AE36 /* libutilities.a in Frameworks */,
                                4727FBC61F991DE90003AE36 /* libsecdRegressions.a in Frameworks */,
                                4727FBC51F991C470003AE36 /* Foundation.framework in Frameworks */,

+                               DA53FC3E23A9C180002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13630,41 +16352,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               478D427D1FD72A8100CAB645 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               479231EE2065B32200B2718C /* libsecurityd_ios.a in Frameworks */,
-                               477A1F5320320E5100ACD81D /* Accounts.framework in Frameworks */,
-                               478D429F1FD72C8400CAB645 /* AppleSystemInfo.framework in Frameworks */,
-                               478D429E1FD72C4800CAB645 /* CrashReporterSupport.framework in Frameworks */,
-                               478D427F1FD72A8100CAB645 /* libprequelite.dylib in Frameworks */,
-                               478D42801FD72A8100CAB645 /* OCMock.framework in Frameworks */,
-                               478D42811FD72A8100CAB645 /* libregressionBase.a in Frameworks */,
-                               478D42821FD72A8100CAB645 /* libACM.a in Frameworks */,
-                               D4911173209559630066A1E4 /* CoreData.framework 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 */,
-                               DC066DF02102563300694EAF /* Security.framework in Frameworks */,
-                               478D42901FD72A8100CAB645 /* SecurityFoundation.framework in Frameworks */,
-                               478D42911FD72A8100CAB645 /* libsqlite3.dylib in Frameworks */,
-                               478D42931FD72A8100CAB645 /* libutilities.a in Frameworks */,
-                               478D42951FD72A8100CAB645 /* libsecurity.a in Frameworks */,
-                               478D42961FD72A8100CAB645 /* libsecdRegressions.a in Frameworks */,
-                               478D42971FD72A8100CAB645 /* Foundation.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                47C2F1802059CB680062DE30 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                47C2F1802059CB680062DE30 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -13686,6 +16373,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D42C838A21158B90008D3D83 /* libCMS.a in Frameworks */,

                                CD791B3C1DFC9A7600F0E5DC /* libsqlite3.0.dylib in Frameworks */,
                                DC3A81D31D99D561000C7419 /* libcoretls.dylib in Frameworks */,
                                DC3A81D51D99D568000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */,
                                CD791B3C1DFC9A7600F0E5DC /* libsqlite3.0.dylib in Frameworks */,
                                DC3A81D31D99D561000C7419 /* libcoretls.dylib in Frameworks */,
                                DC3A81D51D99D568000C7419 /* libcoretls_cfhelpers.dylib in Frameworks */,


@@ -13693,9 +16381,8 @@
                                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                0C78F1D016A5E3EB00654E08 /* libbsm.dylib in Frameworks */,
                                D46246971F9AE2E400D63882 /* libDER.a in Frameworks */,
                                DCD8A19A1E09EE9800E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                0C78F1D016A5E3EB00654E08 /* libbsm.dylib in Frameworks */,
                                D46246971F9AE2E400D63882 /* libDER.a in Frameworks */,

-                               DCD22D771D8CC9CD001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D771D8CC9CD001C9B81 /* libASN1.a in Frameworks */,

                                44A655831AA4B4BB0059D185 /* libctkclient_sep.a in Frameworks */,
                                44A655831AA4B4BB0059D185 /* libctkclient_sep.a in Frameworks */,

-                               DC59E9A41D91C6F0001BDDF5 /* libCMS.a in Frameworks */,

                                DCD22D781D8CC9D8001C9B81 /* libsecurity_ssl.a in Frameworks */,
                                CD791B3D1DFC9AB200F0E5DC /* libsqlite3.dylib in Frameworks */,
                                DC00AB631D821BEF00513D74 /* libsecurity.a in Frameworks */,
                                DCD22D781D8CC9D8001C9B81 /* libsecurity_ssl.a in Frameworks */,
                                CD791B3D1DFC9AB200F0E5DC /* libsqlite3.dylib in Frameworks */,
                                DC00AB631D821BEF00513D74 /* libsecurity.a in Frameworks */,


@@ -13708,6 +16395,7 @@
                                438166ED1B4ECF9400C54D58 /* CoreFoundation.framework in Frameworks */,
                                4CAF67AC0F3A70220064A534 /* IOKit.framework in Frameworks */,
                                0940F6F82151316500C06F18 /* libACM.a in Frameworks */,
                                438166ED1B4ECF9400C54D58 /* CoreFoundation.framework in Frameworks */,
                                4CAF67AC0F3A70220064A534 /* IOKit.framework in Frameworks */,
                                0940F6F82151316500C06F18 /* libACM.a in Frameworks */,

+                               0C2B32A523C4001900A97B18 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13715,15 +16403,15 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C9FB40720D872A600864612 /* CoreCDP.framework in Frameworks */,
+                               0CCC22D623F39B2E00E1FCD0 /* CoreCDP.framework in Frameworks */,

                                43DB54551BB1F8920083C3F1 /* ProtectedCloudStorage.framework in Frameworks */,
                                4C8A38C917B93DF10001B4C0 /* CloudServices.framework in Frameworks */,
                                43DB54551BB1F8920083C3F1 /* ProtectedCloudStorage.framework in Frameworks */,
                                4C8A38C917B93DF10001B4C0 /* CloudServices.framework in Frameworks */,

-                               4C7913251799A5CC00A9633E /* MobileCoreServices.framework in Frameworks */,

                                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */,
                                4C3DD6BD179760280093F9D8 /* libMobileGestalt.dylib in Frameworks */,
                                533B5D4F177CD63100995334 /* SpringBoardServices.framework in Frameworks */,
                                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */,
                                433E519E1B66D5F600482618 /* AppSupport.framework in Frameworks */,
                                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */,
                                4C3DD6BD179760280093F9D8 /* libMobileGestalt.dylib in Frameworks */,
                                533B5D4F177CD63100995334 /* SpringBoardServices.framework in Frameworks */,
                                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */,
                                433E519E1B66D5F600482618 /* AppSupport.framework in Frameworks */,

+                               DC89608D2395C75600D339D9 /* CoreServices.framework in Frameworks */,

                                4C84DA551720698900AEE225 /* AppleAccount.framework in Frameworks */,
                                4CF4C19D171E0EA600877419 /* Accounts.framework in Frameworks */,
                                438168C41B4ED43800C54D58 /* CoreFoundation.framework in Frameworks */,
                                4C84DA551720698900AEE225 /* AppleAccount.framework in Frameworks */,
                                4CF4C19D171E0EA600877419 /* Accounts.framework in Frameworks */,
                                438168C41B4ED43800C54D58 /* CoreFoundation.framework in Frameworks */,


@@ -13738,6 +16426,11 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               0CC9403023F39E84004B71AA /* CoreCDP.framework in Frameworks */,
+                               D47AB2D12356B2FE005A3801 /* Network.framework in Frameworks */,
+                               DC4A76AD22126A17006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB80DE5B219600FC005B10FA /* libz.tbd in Frameworks */,
+                               482FE56F2177CF520031C11E /* AuthKit.framework in Frameworks */,

                                D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */,
                                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABB31D821E0400513D74 /* libSharedRegressions.a in Frameworks */,
                                D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */,
                                D40B6A8E1E2B643500CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABB31D821E0400513D74 /* libSharedRegressions.a in Frameworks */,


@@ -13749,7 +16442,7 @@
                                DC00ABB51D821E0B00513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1F91E09F98E00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                D46246B51F9AE74000D63882 /* libDER.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 */,
+                               DCD22D9B1D8CCFCB001C9B81 /* libASN1.a in Frameworks */,

                                DC65E7771D8CB82500152EF0 /* libregressionBase.a in Frameworks */,
                                438168C01B4ED42C00C54D58 /* CoreFoundation.framework in Frameworks */,
                                DCD22D9C1D8CCFD6001C9B81 /* libutilitiesRegressions.a in Frameworks */,
                                DC65E7771D8CB82500152EF0 /* libregressionBase.a in Frameworks */,
                                438168C01B4ED42C00C54D58 /* CoreFoundation.framework in Frameworks */,
                                DCD22D9C1D8CCFD6001C9B81 /* libutilitiesRegressions.a in Frameworks */,


@@ -13768,6 +16461,7 @@
                                4C711D6D13AFCD0900FE865D /* Security.framework in Frameworks */,
                                D418CC701E690CAD00330A44 /* MobileAsset.framework in Frameworks */,
                                E71F3E4216EA6A6300FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4C711D6D13AFCD0900FE865D /* Security.framework in Frameworks */,
                                D418CC701E690CAD00330A44 /* MobileAsset.framework in Frameworks */,
                                E71F3E4216EA6A6300FAF9B4 /* SystemConfiguration.framework in Frameworks */,

+                               DA3862AA23AAD959001E21F1 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13791,18 +16485,18 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C9FB40920D8735500864612 /* CoreCDP.framework in Frameworks */,
+                               DC4A76A5221268A6006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB7732C221963B0500FCF513 /* libz.tbd in Frameworks */,
+                               482FE56C2177CEEF0031C11E /* AuthKit.framework in Frameworks */,

                                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */,
                                EBE9019A1C22852C007308C6 /* AggregateDictionary.framework in Frameworks */,
                                438168BB1B4ED42300C54D58 /* CoreFoundation.framework in Frameworks */,
                                DC00AB8E1D821D4900513D74 /* libSOSCommands.a in Frameworks */,
                                47D13F631E8447FB0063B6E2 /* SecurityFoundation.framework in Frameworks */,
                                EBE9019A1C22852C007308C6 /* AggregateDictionary.framework in Frameworks */,
                                438168BB1B4ED42300C54D58 /* CoreFoundation.framework in Frameworks */,
                                DC00AB8E1D821D4900513D74 /* libSOSCommands.a in Frameworks */,

-                               DC00AB8F1D821D4D00513D74 /* libSecurityTool.a in Frameworks */,
-                               DC00AB901D821D5600513D74 /* libSecurityCommands.a in Frameworks */,
+                               0CCC22D723F39B7200E1FCD0 /* CoreCDP.framework in Frameworks */,

                                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */,
                                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */,
                                DC65E7361D8CB35E00152EF0 /* libutilities.a in Frameworks */,
                                DCD22D861D8CCBBB001C9B81 /* libSecureObjectSyncServer.a in Frameworks */,
                                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */,
                                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */,
                                DC65E7361D8CB35E00152EF0 /* libutilities.a in Frameworks */,
                                DCD22D861D8CCBBB001C9B81 /* libSecureObjectSyncServer.a in Frameworks */,

-                               DCD8A1EA1E09F87B00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,

                                DCD22D851D8CCBB6001C9B81 /* libsecurityd_ios.a in Frameworks */,
                                4C32C1A60A497A21002891BD /* Security.framework in Frameworks */,
                                4CAE95DC0F3D6E020075278E /* CFNetwork.framework in Frameworks */,
                                DCD22D851D8CCBB6001C9B81 /* libsecurityd_ios.a in Frameworks */,
                                4C32C1A60A497A21002891BD /* Security.framework in Frameworks */,
                                4CAE95DC0F3D6E020075278E /* CFNetwork.framework in Frameworks */,


@@ -13829,6 +16523,7 @@
                                52D82BEE16A622370078DFE5 /* Security.framework in Frameworks */,
                                52D82BDF16A621F70078DFE5 /* Foundation.framework in Frameworks */,
                                E72D462B175FBF3E00F70B9B /* IOKit.framework in Frameworks */,
                                52D82BEE16A622370078DFE5 /* Security.framework in Frameworks */,
                                52D82BDF16A621F70078DFE5 /* Foundation.framework in Frameworks */,
                                E72D462B175FBF3E00F70B9B /* IOKit.framework in Frameworks */,

+                               DA53FC3D23A9BF28002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13836,12 +16531,21 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DC176232224C57D600BB9A6E /* AuthKit.framework in Frameworks */,

                                5328C0521738903F00708984 /* Security.framework in Frameworks */,
                                5346481F17332F9C00FE9172 /* Accounts.framework in Frameworks */,
                                5346480217331E1200FE9172 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                5328C0521738903F00708984 /* Security.framework in Frameworks */,
                                5346481F17332F9C00FE9172 /* Accounts.framework in Frameworks */,
                                5346480217331E1200FE9172 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               5A442F89233C330F00918373 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               5A442F8A233C330F00918373 /* Security.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                5E10992219A5E55800A60E2B /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                5E10992219A5E55800A60E2B /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -13855,9 +16559,13 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DC4A76A02212676D006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB80DE5D21960C0A005B10FA /* libz.tbd in Frameworks */,
+                               482FE5662177C6E40031C11E /* AuthKit.framework in Frameworks */,
+                               482FE5652177C6D90031C11E /* Accounts.framework in Frameworks */,

                                D46246BA1F9AE7A000D63882 /* libDER.a in Frameworks */,
                                DCCD34001E4001AD00AA4AD1 /* libACM.a in Frameworks */,
                                D46246BA1F9AE7A000D63882 /* libDER.a in Frameworks */,
                                DCCD34001E4001AD00AA4AD1 /* libACM.a in Frameworks */,

-                               DCAB14271E40039600C81511 /* libASN1_not_installed.a in Frameworks */,
+                               DCAB14271E40039600C81511 /* libASN1.a in Frameworks */,

                                EBF2D73C1C1E2B47006AB6FF /* Foundation.framework in Frameworks */,
                                DCD22D801D8CCB0F001C9B81 /* libutilities.a in Frameworks */,
                                DC00ABCC1D821F0B00513D74 /* libsecurityd_ios.a in Frameworks */,
                                EBF2D73C1C1E2B47006AB6FF /* Foundation.framework in Frameworks */,
                                DCD22D801D8CCB0F001C9B81 /* libutilities.a in Frameworks */,
                                DC00ABCC1D821F0B00513D74 /* libsecurityd_ios.a in Frameworks */,


@@ -13871,6 +16579,50 @@
                                5E43C48D1B00D07000E5ECB2 /* CoreFoundation.framework in Frameworks */,
                                5E43C4961B00D3B500E5ECB2 /* IOKit.framework in Frameworks */,
                                5E43C49A1B00D4D800E5ECB2 /* Security.framework in Frameworks */,
                                5E43C48D1B00D07000E5ECB2 /* CoreFoundation.framework in Frameworks */,
                                5E43C4961B00D3B500E5ECB2 /* IOKit.framework in Frameworks */,
                                5E43C49A1B00D4D800E5ECB2 /* Security.framework in Frameworks */,

+                               DA53FC4623A9CB13002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C2045E72424BA7E00F9461D /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6CB0C5F824ACDB5300479FB4 /* Security.framework in Frameworks */,
+                               6CA9690A24ACC2D100C08B5E /* libutilities.a in Frameworks */,
+                               6C2045F52424BBDD00F9461D /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C39235A21F13E4D00D018AD /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6C540C3922289A3B0032B5BC /* CloudServices.framework in Frameworks */,
+                               6C39235B21F13E4D00D018AD /* libz.dylib in Frameworks */,
+                               6C39235C21F13E4D00D018AD /* AuthKit.framework in Frameworks */,
+                               6C39235D21F13E4D00D018AD /* Security.framework in Frameworks */,
+                               6C39235E21F13E4D00D018AD /* libsecurity.a in Frameworks */,
+                               6C39235F21F13E4D00D018AD /* libsecurityd_ios.a in Frameworks */,
+                               6C39236021F13E4D00D018AD /* Accounts.framework in Frameworks */,
+                               6C39236121F13E4D00D018AD /* libprequelite.dylib in Frameworks */,
+                               6C39236321F13E4D00D018AD /* libregressionBase.a in Frameworks */,
+                               6C39236421F13E4D00D018AD /* libACM.a in Frameworks */,
+                               6C39236521F13E4D00D018AD /* ApplePushService.framework in Frameworks */,
+                               6C39236621F13E4D00D018AD /* SharedWebCredentials.framework in Frameworks */,
+                               6C39236721F13E4D00D018AD /* IOKit.framework in Frameworks */,
+                               6C39236821F13E4D00D018AD /* WirelessDiagnostics.framework in Frameworks */,
+                               6C39236921F13E4D00D018AD /* SystemConfiguration.framework in Frameworks */,
+                               6C39236A21F13E4D00D018AD /* libSecureObjectSyncServer.a in Frameworks */,
+                               6C39236B21F13E4D00D018AD /* libSecureObjectSyncFramework.a in Frameworks */,
+                               6C39236C21F13E4D00D018AD /* ProtocolBuffer.framework in Frameworks */,
+                               6C39236D21F13E4D00D018AD /* CoreData.framework in Frameworks */,
+                               6C39236E21F13E4D00D018AD /* CloudKit.framework in Frameworks */,
+                               6C39237021F13E4D00D018AD /* SecurityFoundation.framework in Frameworks */,
+                               6C39237121F13E4D00D018AD /* libsqlite3.dylib in Frameworks */,
+                               6C39237221F13E4D00D018AD /* libutilities.a in Frameworks */,
+                               6C39237321F13E4D00D018AD /* libsecdRegressions.a in Frameworks */,
+                               6C39237421F13E4D00D018AD /* Foundation.framework in Frameworks */,
+                               DA53FC3F23A9C26F002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13878,8 +16630,8 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               5AF7630920520870001557AE /* AuthKit.framework in Frameworks */,
-                               5A4E527B2051D857009D5826 /* Accounts.framework in Frameworks */,
+                               D4A7DD7520A26D4900F51F3F /* AuthKit.framework in Frameworks */,
+                               AA15CB4F2076C9D500C1A978 /* Accounts.framework in Frameworks */,

                                D4119E79202BDF580048587B /* libz.tbd in Frameworks */,
                                6CDB601B1FA93A2000410924 /* libprequelite.tbd in Frameworks */,
                                6CDB601A1FA93A1800410924 /* libsqlite3.tbd in Frameworks */,
                                D4119E79202BDF580048587B /* libz.tbd in Frameworks */,
                                6CDB601B1FA93A2000410924 /* libprequelite.tbd in Frameworks */,
                                6CDB601A1FA93A1800410924 /* libsqlite3.tbd in Frameworks */,


@@ -13887,62 +16639,34 @@
                                D4119E882032A8FA0048587B /* OCMock.framework in Frameworks */,
                                6C13AE481F8E9FC800F047E3 /* libutilities.a in Frameworks */,
                                6C4605A51F882B9B001421B6 /* Foundation.framework in Frameworks */,
                                D4119E882032A8FA0048587B /* OCMock.framework in Frameworks */,
                                6C13AE481F8E9FC800F047E3 /* libutilities.a in Frameworks */,
                                6C4605A51F882B9B001421B6 /* Foundation.framework in Frameworks */,

+                               DA53FC4123A9C3CE002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6C9808481E788AEB00E70590 /* Frameworks */ = {
+               6C7BE2D223C3DD64003BB2CA /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               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 */,
-                               6C98084E1E788AEB00E70590 /* libSecureObjectSyncServer.a in Frameworks */,
-                               6C98084F1E788AEB00E70590 /* libsecurity.a in Frameworks */,
-                               6C9808501E788AEB00E70590 /* libutilities.a in Frameworks */,
-                               6C9808511E788AEB00E70590 /* CFNetwork.framework in Frameworks */,
-                               6C9808521E788AEB00E70590 /* Foundation.framework in Frameworks */,
-                               6C9808531E788AEB00E70590 /* IOKit.framework in Frameworks */,
-                               6C9808541E788AEB00E70590 /* OCMock.framework in Frameworks */,
-                               DCB515DE1ED3CF86001F1152 /* SecurityFoundation.framework in Frameworks */,
-                               6C9808551E788AEB00E70590 /* SystemConfiguration.framework in Frameworks */,
-                               6C9808561E788AEB00E70590 /* libACM.a in Frameworks */,
-                               6C9808571E788AEB00E70590 /* libaks_acl.a in Frameworks */,
-                               6C9808581E788AEB00E70590 /* libbsm.dylib in Frameworks */,
-                               6C9808591E788AEB00E70590 /* libcoreauthd_client.a in Frameworks */,
-                               6C98085A1E788AEB00E70590 /* libctkclient_sep.a in Frameworks */,
-                               6C98085B1E788AEB00E70590 /* libsqlite3.0.dylib in Frameworks */,
-                               6C98085C1E788AEB00E70590 /* libz.dylib in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               6C9808841E788AFD00E70590 /* Frameworks */ = {
+                               6C16258823C5001C0086A0FF /* libSecureObjectSyncServer.a in Frameworks */,
+                               6C16258723C4FFEC0086A0FF /* libMobileGestalt.tbd in Frameworks */,
+                               6C7BE2EB23C3DDC3003BB2CA /* libsecurityd_bridge.a in Frameworks */,
+                               6C7BE2D423C3DD64003BB2CA /* libz.tbd in Frameworks */,
+                               6C7BE2D723C3DD64003BB2CA /* SecurityFoundation.framework in Frameworks */,
+                               6C7BE2D823C3DD64003BB2CA /* AggregateDictionary.framework in Frameworks */,
+                               6C7BE2D923C3DD64003BB2CA /* CoreFoundation.framework in Frameworks */,
+                               6C7BE2DC23C3DD64003BB2CA /* libaks_acl.a in Frameworks */,
+                               6C7BE2DD23C3DD64003BB2CA /* libutilities.a in Frameworks */,
+                               6C7BE2E023C3DD64003BB2CA /* Security.framework in Frameworks */,
+                               6C7BE2E323C3DD64003BB2CA /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C96327E242A279B00C53CE2 /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               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 */,
-                               6C98088A1E788AFD00E70590 /* libSecureObjectSyncServer.a in Frameworks */,
-                               6C98088B1E788AFD00E70590 /* libsecurity.a in Frameworks */,
-                               6C98088C1E788AFD00E70590 /* libutilities.a in Frameworks */,
-                               6C98088D1E788AFD00E70590 /* CFNetwork.framework in Frameworks */,
-                               6C98088E1E788AFD00E70590 /* Foundation.framework in Frameworks */,
-                               6C98088F1E788AFD00E70590 /* IOKit.framework in Frameworks */,
-                               6C9808901E788AFD00E70590 /* OCMock.framework in Frameworks */,
-                               DCB515DF1ED3CF95001F1152 /* SecurityFoundation.framework in Frameworks */,
-                               6C9808911E788AFD00E70590 /* SystemConfiguration.framework in Frameworks */,
-                               6C9808921E788AFD00E70590 /* libACM.a in Frameworks */,
-                               6C9808931E788AFD00E70590 /* libaks_acl.a in Frameworks */,
-                               6C9808941E788AFD00E70590 /* libbsm.dylib in Frameworks */,
-                               6C9808951E788AFD00E70590 /* libcoreauthd_client.a in Frameworks */,
-                               6C9808961E788AFD00E70590 /* libctkclient_sep.a in Frameworks */,
-                               6C9808971E788AFD00E70590 /* libsqlite3.0.dylib in Frameworks */,
-                               6C9808981E788AFD00E70590 /* libz.dylib in Frameworks */,
+                               6C61D3E9242A2C14008AB9BB /* Security.framework in Frameworks */,
+                               6C96328A242A284C00C53CE2 /* MobileKeyBag.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -13959,10 +16683,10 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               5AF762FF2051F990001557AE /* AuthKit.framework in Frameworks */,
-                               5A4E52792051D7FA009D5826 /* Accounts.framework in Frameworks */,
+                               AA15CB4D2076C5A900C1A978 /* Accounts.framework in Frameworks */,

                                D4119E78202BDF490048587B /* libz.tbd in Frameworks */,
                                6CAA8D3B1F8431AE007B6E03 /* Foundation.framework in Frameworks */,
                                D4119E78202BDF490048587B /* libz.tbd in Frameworks */,
                                6CAA8D3B1F8431AE007B6E03 /* Foundation.framework in Frameworks */,

+                               D4A7DD7420A26D3D00F51F3F /* AuthKit.framework in Frameworks */,

                                6CAA8D3A1F8431A7007B6E03 /* libutilities.a in Frameworks */,
                                6CAA8D371F843196007B6E03 /* Security.framework in Frameworks */,
                        );
                                6CAA8D3A1F8431A7007B6E03 /* libutilities.a in Frameworks */,
                                6CAA8D371F843196007B6E03 /* Security.framework in Frameworks */,
                        );


@@ -13981,37 +16705,30 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCCA5E841E539EE7009EE93D /* AppKit.framework in Frameworks */,

                                6CAB39C71E521BEA00566A79 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                6CAB39C71E521BEA00566A79 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6CF4A0DD1E4549F200ECD7B5 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               6CE22D701E49206600974785 /* UIKit.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                790851B40CA9859F0083CC4D /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                790851B40CA9859F0083CC4D /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DCF46571220110E100BA6EEA /* CloudServices.framework in Frameworks */,
+                               EB80DE5A219600F2005B10FA /* libz.tbd in Frameworks */,
+                               DC9C066D2149E33D00C6F7B8 /* AuthKit.framework in Frameworks */,

                                D47CA65D1EB036450038E2BB /* libMobileGestalt.dylib in Frameworks */,
                                CD9F2AF81DF23CA600AD3577 /* Foundation.framework in Frameworks */,
                                DC65E72A1D8CB2FC00152EF0 /* libutilities.a in Frameworks */,
                                438168941B4ED42300C54D58 /* CoreFoundation.framework in Frameworks */,
                                DC00AB811D821C9100513D74 /* libsecurityd_ios.a in Frameworks */,
                                DC00AB821D821C9500513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                D47CA65D1EB036450038E2BB /* libMobileGestalt.dylib in Frameworks */,
                                CD9F2AF81DF23CA600AD3577 /* Foundation.framework in Frameworks */,
                                DC65E72A1D8CB2FC00152EF0 /* libutilities.a in Frameworks */,
                                438168941B4ED42300C54D58 /* CoreFoundation.framework in Frameworks */,
                                DC00AB811D821C9100513D74 /* libsecurityd_ios.a in Frameworks */,
                                DC00AB821D821C9500513D74 /* libSecureObjectSyncServer.a in Frameworks */,

-                               DCD8A1E71E09F85400E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,

                                DC00AB831D821C9A00513D74 /* libSWCAgent.a in Frameworks */,
                                790851EE0CA9B3410083CC4D /* Security.framework in Frameworks */,
                                D491116A2095593E0066A1E4 /* CoreData.framework in Frameworks */,
                                E71F3E3116EA69A900FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4CAF66190F3A6FCD0064A534 /* IOKit.framework in Frameworks */,
                                DC00AB831D821C9A00513D74 /* libSWCAgent.a in Frameworks */,
                                790851EE0CA9B3410083CC4D /* Security.framework in Frameworks */,
                                D491116A2095593E0066A1E4 /* CoreData.framework in Frameworks */,
                                E71F3E3116EA69A900FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4CAF66190F3A6FCD0064A534 /* IOKit.framework in Frameworks */,

-                               4432B15E1A014D37000958DC /* libaks_acl.a in Frameworks */,

                                4C2215220F3A612C00835155 /* libsqlite3.dylib in Frameworks */,
                                4C2215220F3A612C00835155 /* libsqlite3.dylib in Frameworks */,

+                               0C2B32A423C4000F00A97B18 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14021,7 +16738,6 @@
                        files = (
                                DCD22D881D8CCBEF001C9B81 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD22D871D8CCBEA001C9B81 /* libsecurityd_ios.a in Frameworks */,
                        files = (
                                DCD22D881D8CCBEF001C9B81 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD22D871D8CCBEA001C9B81 /* libsecurityd_ios.a in Frameworks */,

-                               DC00ABEC1D821FA600513D74 /* libSecurityTool.a in Frameworks */,

                                5296CB501655B990009912AF /* libMobileGestalt.dylib in Frameworks */,
                                DCD22D751D8CC8A5001C9B81 /* libutilities.a in Frameworks */,
                                4432B1A61A024231000958DC /* libaks_acl.a in Frameworks */,
                                5296CB501655B990009912AF /* libMobileGestalt.dylib in Frameworks */,
                                DCD22D751D8CC8A5001C9B81 /* libutilities.a in Frameworks */,
                                4432B1A61A024231000958DC /* libaks_acl.a in Frameworks */,


@@ -14063,17 +16779,39 @@
                                DC00AB9A1D821D8800513D74 /* libSWCAgent.a in Frameworks */,
                                DCD22D981D8CCF78001C9B81 /* libutilities.a in Frameworks */,
                                BE442BB318B7FDB800F24DAE /* Security.framework in Frameworks */,
                                DC00AB9A1D821D8800513D74 /* libSWCAgent.a in Frameworks */,
                                DCD22D981D8CCF78001C9B81 /* libutilities.a in Frameworks */,
                                BE442BB318B7FDB800F24DAE /* Security.framework in Frameworks */,

+                               DC89608E2395C76300D339D9 /* CoreServices.framework in Frameworks */,

                                BE442BB418B7FDB800F24DAE /* SystemConfiguration.framework in Frameworks */,
                                BE442BB618B7FDB800F24DAE /* CFNetwork.framework in Frameworks */,
                                BE25C41618B83491003320E0 /* Foundation.framework in Frameworks */,
                                BE442BB718B7FDB800F24DAE /* IOKit.framework in Frameworks */,
                                438168C61B4ED43F00C54D58 /* CoreFoundation.framework in Frameworks */,
                                BE442BB418B7FDB800F24DAE /* SystemConfiguration.framework in Frameworks */,
                                BE442BB618B7FDB800F24DAE /* CFNetwork.framework in Frameworks */,
                                BE25C41618B83491003320E0 /* Foundation.framework in Frameworks */,
                                BE442BB718B7FDB800F24DAE /* IOKit.framework in Frameworks */,
                                438168C61B4ED43F00C54D58 /* CoreFoundation.framework in Frameworks */,

-                               D4B858671D370D9A003B2D95 /* MobileCoreServices.framework in Frameworks */,

                                BE442BB818B7FDB800F24DAE /* libsqlite3.dylib in Frameworks */,
                                BE442BB918B7FDB800F24DAE /* libbsm.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                BE442BB818B7FDB800F24DAE /* libsqlite3.dylib in Frameworks */,
                                BE442BB918B7FDB800F24DAE /* libbsm.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               BEAA0028202A832500E51F45 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               BECEC11C20A634E000E97255 /* ProtocolBuffer.framework in Frameworks */,
+                               BEAA0046202B785000E51F45 /* Foundation.framework in Frameworks */,
+                               D401E8B420A26F1F00CD8BB4 /* CoreData.framework in Frameworks */,
+                               DC340C54208E828F004D7EEC /* TrustedPeers.framework in Frameworks */,
+                               BE9F8D15206C2E0200B53D16 /* libutilities.a in Frameworks */,
+                               DA53FC4923A9CC8D002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               BECFA42B20F91AFE00B11002 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               BECFA43B20F91CE500B11002 /* ProtocolBuffer.framework in Frameworks */,
+                               BECFA43A20F91B8300B11002 /* TrustedPeers.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                BED208D71EDF950E00753952 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                BED208D71EDF950E00753952 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14083,6 +16821,28 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               BED987D02099145300607A5F /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF46575220115E300BA6EEA /* CloudServices.framework in Frameworks */,
+                               DC00C92320B3B80500628BEB /* libbsm.tbd in Frameworks */,
+                               DC00C92420B3B82600628BEB /* libz.tbd in Frameworks */,
+                               DC00C92020B3B7CC00628BEB /* libDER.a in Frameworks */,
+                               DC60132E2147220600863C1A /* libsecurityd_ios.a in Frameworks */,
+                               BE53602D209BBF630027E25A /* libMobileGestalt.tbd in Frameworks */,
+                               DC9C06712149E6B900C6F7B8 /* AuthKit.framework in Frameworks */,
+                               BE536019209BB76B0027E25A /* CloudKit.framework in Frameworks */,
+                               DC00C93420B48B4100628BEB /* SystemConfiguration.framework in Frameworks */,
+                               BED987DF209918A500607A5F /* SecurityFoundation.framework in Frameworks */,
+                               BED987D82099145300607A5F /* TrustedPeers.framework in Frameworks */,
+                               DC00C93520B48BA800628BEB /* IOKit.framework in Frameworks */,
+                               BE53601B209BB8390027E25A /* libSecureObjectSyncServer.a in Frameworks */,
+                               BE53601A209BB7F80027E25A /* libutilities.a in Frameworks */,
+                               DA3862A723A9CD2E001E21F1 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                BEF88C241EAFFC3F00357577 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                BEF88C241EAFFC3F00357577 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14094,7 +16854,9 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               BEF88C311EAFFC3F00357577 /* TrustedPeers.framework in Frameworks */,
+                               DC730E2922401F5E0051DD48 /* ProtocolBuffer.framework in Frameworks */,
+                               DC730E2522401E310051DD48 /* TrustedPeers.framework in Frameworks */,
+                               BE72782C209D2C1400F0DA77 /* SecurityFoundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14105,6 +16867,7 @@
                                D46246AA1F9AE6CA00D63882 /* libDER.a in Frameworks */,
                                D41258011E94230400781F23 /* IOKit.framework in Frameworks */,
                                D41257E01E94136000781F23 /* libz.dylib in Frameworks */,
                                D46246AA1F9AE6CA00D63882 /* libDER.a in Frameworks */,
                                D41258011E94230400781F23 /* IOKit.framework in Frameworks */,
                                D41257E01E94136000781F23 /* libz.dylib in Frameworks */,

+                               D47AB2CB2356AD72005A3801 /* Network.framework in Frameworks */,

                                D41257DF1E94133600781F23 /* CFNetwork.framework in Frameworks */,
                                D41257DE1E94132900781F23 /* libsqlite3.dylib in Frameworks */,
                                D41257DB1E9412E700781F23 /* libutilities.a in Frameworks */,
                                D41257DF1E94133600781F23 /* CFNetwork.framework in Frameworks */,
                                D41257DE1E94132900781F23 /* libsqlite3.dylib in Frameworks */,
                                D41257DB1E9412E700781F23 /* libutilities.a in Frameworks */,


@@ -14112,6 +16875,84 @@
                                D41257E21E94138600781F23 /* CoreFoundation.framework in Frameworks */,
                                D41257D01E9410A300781F23 /* Foundation.framework in Frameworks */,
                                D450686A1E948D2200FA7675 /* Security.framework in Frameworks */,
                                D41257E21E94138600781F23 /* CoreFoundation.framework in Frameworks */,
                                D41257D01E9410A300781F23 /* Foundation.framework in Frameworks */,
                                D450686A1E948D2200FA7675 /* Security.framework in Frameworks */,

+                               DA53FC3C23A9BDD5002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D42C839621159146008D3D83 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D44D1F642115893000E76E1A /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D453A4B12122236D00850A26 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D49BD0762476F74B00FC7E1C /* libMobileGestalt.tbd in Frameworks */,
+                               D4FD4225217D7BEE002B7EE2 /* libarchive.2.tbd in Frameworks */,
+                               D453A4B22122236D00850A26 /* libz.tbd in Frameworks */,
+                               D453A4B32122236D00850A26 /* libsqlite3.tbd in Frameworks */,
+                               D453A4B42122236D00850A26 /* libDER.a in Frameworks */,
+                               D453A4B52122236D00850A26 /* libutilities.a in Frameworks */,
+                               D4428B36212262F800EB8448 /* libASN1.a in Frameworks */,
+                               D453A4B62122236D00850A26 /* libtrustd.a in Frameworks */,
+                               D4EF32172156B025000A31A5 /* Security.framework in Frameworks */,
+                               D47AB2CE2356AD95005A3801 /* Network.framework in Frameworks */,
+                               D4267BD323440F9900B54678 /* CFNetwork.framework in Frameworks */,
+                               D453A4B82122236D00850A26 /* CoreFoundation.framework in Frameworks */,
+                               D453A4B92122236D00850A26 /* Foundation.framework in Frameworks */,
+                               D453A4BA2122236D00850A26 /* IOKit.framework in Frameworks */,
+                               D40B7CA021605BF800AC9A75 /* OCMock.framework in Frameworks */,
+                               DA3862AB23AAE3A8001E21F1 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D458C4DE214E1DE00043D982 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D458C501214E1FB00043D982 /* Foundation.framework in Frameworks */,
+                               D458C4FF214E1F8E0043D982 /* UIKit.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D458C503214E20530043D982 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D458C512214E20850043D982 /* XCTest.framework in Frameworks */,
+                               D458C507214E20540043D982 /* Foundation.framework in Frameworks */,
+                               DA2F592623A99EC900C30285 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D4707A0221136E69005BCFDA /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D49BD0742476F67700FC7E1C /* libMobileGestalt.tbd in Frameworks */,
+                               D4FD4224217D7BE4002B7EE2 /* libarchive.2.tbd in Frameworks */,
+                               D4B68C62211A80CE009FED69 /* libz.tbd in Frameworks */,
+                               D4B68C5F211A80B1009FED69 /* libsqlite3.tbd in Frameworks */,
+                               D4B68C5D211A7D98009FED69 /* libDER.a in Frameworks */,
+                               D4B68C5B211A7D29009FED69 /* libutilities.a in Frameworks */,
+                               D4B68C44211A3DCC009FED69 /* libtrustd.a in Frameworks */,
+                               D453A4A32122235700850A26 /* Security.framework in Frameworks */,
+                               D4267BD123440F8900B54678 /* CFNetwork.framework in Frameworks */,
+                               D47AB2CD2356AD8B005A3801 /* Network.framework in Frameworks */,
+                               D4B68C60211A80BC009FED69 /* CoreFoundation.framework in Frameworks */,
+                               D4B68C61211A80C4009FED69 /* Foundation.framework in Frameworks */,
+                               D4B68C63211A80DA009FED69 /* IOKit.framework in Frameworks */,
+                               DA53FC4723A9CBAA002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14122,6 +16963,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               D4D1FDDA21165F8B003538E2 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DA30D6731DF8C8FB00EC6B43 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DA30D6731DF8C8FB00EC6B43 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14129,6 +16977,19 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DA41FE0B2241ADC000838FB3 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0CC593F92299EE06006C34B5 /* libsecurityd_ios.a in Frameworks */,
+                               0CE887D52299A9C70082D120 /* SystemConfiguration.framework in Frameworks */,
+                               0CE887D32299A9090082D120 /* libutilities.a in Frameworks */,
+                               0CE887D22299A8CF0082D120 /* libMobileGestalt.tbd in Frameworks */,
+                               DA41FE1B2241AF8200838FB3 /* IDS.framework in Frameworks */,
+                               DAC58D1B22443C0700D4CD41 /* KeychainCircle.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DAE40BC820CF3E46002D5674 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DAE40BC820CF3E46002D5674 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14152,6 +17013,14 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC05037321409A4000A8EDB7 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DC05038221409B3400A8EDB7 /* OCMock.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC0BC54E1D8B6D2D00070CB0 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DC0BC54E1D8B6D2D00070CB0 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14297,7 +17166,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DC0BCC1A1D8C653600070CB0 /* MobileKeyBag.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14305,7 +17173,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DC0BCC291D8C684F00070CB0 /* MobileKeyBag.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14313,7 +17180,17 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DC0BCD1D1D8C694700070CB0 /* MobileKeyBag.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DC0EF8EC208697C600AB9E95 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCFFE96D2277E0E90092069C /* TrustedPeers.framework in Frameworks */,
+                               DCB41DF4216C2DD300F219E0 /* AppleAccount.framework in Frameworks */,
+                               DCB41DF1216C2DBB00F219E0 /* AuthKit.framework in Frameworks */,
+                               DC99B88020EACA470065B73B /* libMobileGestalt.tbd in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14321,9 +17198,10 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D49BD0772476F7C000FC7E1C /* libMobileGestalt.tbd in Frameworks */,

                                4C47FA9420A51DD800384CB6 /* AppleFSCompression.framework in Frameworks */,
                                4C47FA9420A51DD800384CB6 /* AppleFSCompression.framework in Frameworks */,

-                               CD9F2AFB1DF24BAF00AD3577 /* Foundation.framework in Frameworks */,
-                               DCD22D4B1D8CBF54001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D4B1D8CBF54001C9B81 /* libASN1.a in Frameworks */,
+                               F6B1B48B24144B5F00CB3E3F /* libctkloginhelperlite.a in Frameworks */,

                                DC00AB6F1D821C3400513D74 /* libSecItemShimOSX.a in Frameworks */,
                                DC00AB701D821C3800513D74 /* libSecOtrOSX.a in Frameworks */,
                                DC00AB6B1D821C1A00513D74 /* libSecTrustOSX.a in Frameworks */,
                                DC00AB6F1D821C3400513D74 /* libSecItemShimOSX.a in Frameworks */,
                                DC00AB701D821C3800513D74 /* libSecOtrOSX.a in Frameworks */,
                                DC00AB6B1D821C1A00513D74 /* libSecTrustOSX.a in Frameworks */,


@@ -14340,7 +17218,7 @@
                                DCD22D4D1D8CBF95001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */,
                                DCD22D4E1D8CBFAB001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */,
                                DCC5BF211D937269008D1E84 /* libsecurity_checkpw.a in Frameworks */,
                                DCD22D4D1D8CBF95001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */,
                                DCD22D4E1D8CBFAB001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */,
                                DCC5BF211D937269008D1E84 /* libsecurity_checkpw.a in Frameworks */,

-                               DCC5BF221D937270008D1E84 /* libsecurity_cms.a in Frameworks */,
+                               D42C839F211593D8008D3D83 /* libsecurity_cms.a in Frameworks */,

                                DCD06BD51D8E173A007602F1 /* libsecurity_codesigning.a in Frameworks */,
                                DCC5BF231D937277008D1E84 /* libsecurity_comcryption.a in Frameworks */,
                                DCC5BF241D93727E008D1E84 /* libsecurity_cryptkit.a in Frameworks */,
                                DCD06BD51D8E173A007602F1 /* libsecurity_codesigning.a in Frameworks */,
                                DCC5BF231D937277008D1E84 /* libsecurity_comcryption.a in Frameworks */,
                                DCC5BF241D93727E008D1E84 /* libsecurity_cryptkit.a in Frameworks */,


@@ -14352,7 +17230,6 @@
                                DCD06BD31D8E1628007602F1 /* libsecurity_ocspd.a in Frameworks */,
                                DCD06BD11D8E15ED007602F1 /* libsecurity_pkcs12.a in Frameworks */,
                                DCC5BF291D93729A008D1E84 /* libsecurity_sd_cspdl.a in Frameworks */,
                                DCD06BD31D8E1628007602F1 /* libsecurity_ocspd.a in Frameworks */,
                                DCD06BD11D8E15ED007602F1 /* libsecurity_pkcs12.a in Frameworks */,
                                DCC5BF291D93729A008D1E84 /* libsecurity_sd_cspdl.a in Frameworks */,

-                               DC1789471D779AAF00B50D50 /* libsecurity_smime.a in Frameworks */,

                                DCC5BF2A1D93729E008D1E84 /* libsecurity_ssl.a in Frameworks */,
                                DCC5BF2B1D9372A4008D1E84 /* libsecurity_transform.a in Frameworks */,
                                DCC5BF2C1D9372AA008D1E84 /* libsecurity_translocate.a in Frameworks */,
                                DCC5BF2A1D93729E008D1E84 /* libsecurity_ssl.a in Frameworks */,
                                DCC5BF2B1D9372A4008D1E84 /* libsecurity_transform.a in Frameworks */,
                                DCC5BF2C1D9372AA008D1E84 /* libsecurity_translocate.a in Frameworks */,


@@ -14360,9 +17237,7 @@
                                DCD22D4C1D8CBF7E001C9B81 /* libsecurityd_client.a in Frameworks */,
                                DC65E7241D8CB29E00152EF0 /* libutilities.a in Frameworks */,
                                DC1789131D7798B300B50D50 /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                DCD22D4C1D8CBF7E001C9B81 /* libsecurityd_client.a in Frameworks */,
                                DC65E7241D8CB29E00152EF0 /* libutilities.a in Frameworks */,
                                DC1789131D7798B300B50D50 /* libDiagnosticMessagesClient.dylib in Frameworks */,

-                               DC1789151D77997F00B50D50 /* libOpenScriptingUtil.dylib in Frameworks */,

                                DC1789281D779A0F00B50D50 /* libaks_acl.a in Frameworks */,
                                DC1789281D779A0F00B50D50 /* libaks_acl.a in Frameworks */,

-                               DC1789171D77998700B50D50 /* libauto.dylib in Frameworks */,

                                DC1789191D77998C00B50D50 /* libbsm.dylib in Frameworks */,
                                DC17892A1D779A3200B50D50 /* libcoreauthd_client.a in Frameworks */,
                                DC3A81D61D99D57F000C7419 /* libcoretls.dylib in Frameworks */,
                                DC1789191D77998C00B50D50 /* libbsm.dylib in Frameworks */,
                                DC17892A1D779A3200B50D50 /* libcoreauthd_client.a in Frameworks */,
                                DC3A81D61D99D57F000C7419 /* libcoretls.dylib in Frameworks */,


@@ -14376,10 +17251,11 @@
                                DC1789251D7799CD00B50D50 /* CoreFoundation.framework in Frameworks */,
                                DC1789271D7799D400B50D50 /* IOKit.framework in Frameworks */,
                                0940F6F92151316600C06F18 /* libACM.a in Frameworks */,
                                DC1789251D7799CD00B50D50 /* CoreFoundation.framework in Frameworks */,
                                DC1789271D7799D400B50D50 /* IOKit.framework in Frameworks */,
                                0940F6F92151316600C06F18 /* libACM.a in Frameworks */,

+                               DA2F591823A32BC100C30285 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC222C631E034D1F00B09171 /* Frameworks */ = {
+               DC311E732124B8A8002F5EAE /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (


@@ -14390,27 +17266,33 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DCF465742201155000BA6EEA /* CloudServices.framework in Frameworks */,
+                               DC391FAE21C1903E00772585 /* libutilities.a in Frameworks */,
+                               EBD531772198AF19003A57E6 /* Accounts.framework in Frameworks */,
+                               EBD531762198AF0B003A57E6 /* AppleAccount.framework in Frameworks */,
+                               DC9C06702149E3CB00C6F7B8 /* AuthKit.framework in Frameworks */,

                                D46246BE1F9AE86400D63882 /* libDER.a in Frameworks */,
                                47A0ABA81E6F7B24001B388C /* SecurityFoundation.framework in Frameworks */,
                                D46246BE1F9AE86400D63882 /* libDER.a in Frameworks */,
                                47A0ABA81E6F7B24001B388C /* SecurityFoundation.framework in Frameworks */,

-                               DC3502C51E020D5100BC0587 /* libASN1_not_installed.a in Frameworks */,
-                               DC222C7A1E034EF700B09171 /* libsecurityd_ios_NO_AKS.a in Frameworks */,
-                               DC0984FD1E1DB6DF00140ADC /* libSecureObjectSyncFramework.a in Frameworks */,
+                               DC3502C51E020D5100BC0587 /* libASN1.a in Frameworks */,

                                DC0984FE1E1DB70100140ADC /* libSecureObjectSyncServer.a in Frameworks */,
                                DC0984FE1E1DB70100140ADC /* libSecureObjectSyncServer.a in Frameworks */,

-                               DC3502D61E02118000BC0587 /* libsecurity.a in Frameworks */,
-                               DC3502CF1E020E2900BC0587 /* libutilities.a in Frameworks */,
+                               DC311E682124A9E1002F5EAE /* libsecurityd_ios.a in Frameworks */,

                                DC222C351E02418100B09171 /* CFNetwork.framework in Frameworks */,
                                D491116F209559510066A1E4 /* CoreData.framework in Frameworks */,
                                DC3502DF1E02129F00BC0587 /* Foundation.framework in Frameworks */,
                                DC3502D21E02113900BC0587 /* IOKit.framework in Frameworks */,
                                DC3502E91E02172C00BC0587 /* OCMock.framework in Frameworks */,
                                DC3502E31E0212E600BC0587 /* SystemConfiguration.framework in Frameworks */,
                                DC222C351E02418100B09171 /* CFNetwork.framework in Frameworks */,
                                D491116F209559510066A1E4 /* CoreData.framework in Frameworks */,
                                DC3502DF1E02129F00BC0587 /* Foundation.framework in Frameworks */,
                                DC3502D21E02113900BC0587 /* IOKit.framework in Frameworks */,
                                DC3502E91E02172C00BC0587 /* OCMock.framework in Frameworks */,
                                DC3502E31E0212E600BC0587 /* SystemConfiguration.framework in Frameworks */,

-                               DC3502D31E02115200BC0587 /* libACM.a in Frameworks */,
-                               DC0950411E38271300B2C8AC /* libaks_acl.a in Frameworks */,

                                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */,
                                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */,

-                               DC3502E41E02130600BC0587 /* libcoreauthd_client.a in Frameworks */,
-                               DC3502E21E0212D100BC0587 /* libctkclient_sep.a in Frameworks */,

                                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */,
                                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */,
                                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */,
                                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */,

+                               DA53FC4023A9C351002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DC36895C21235F42003A3735 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14439,28 +17321,10 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC52EA471D80CB7000B0A59C /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC52EAA31D80CCC300B0A59C /* Foundation.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC52EBCF1D80CEF100B0A59C /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC52EBD01D80CEF100B0A59C /* Foundation.framework in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                DC52EC2E1D80CFB200B0A59C /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                DC52EC2E1D80CFB200B0A59C /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C9FB40820D8731800864612 /* CoreCDP.framework in Frameworks */,
-                               DC52EC2F1D80CFB200B0A59C /* Foundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14482,9 +17346,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               7281E0971DFD0FD00021E1B7 /* Foundation.framework in Frameworks */,
-                               DC52EC6C1D80D0E800B0A59C /* IDS.framework in Frameworks */,
-                               DC52EC6B1D80D0E300B0A59C /* IDSFoundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14499,7 +17360,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DC52EDA11D80D4FC00B0A59C /* IDS.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14507,9 +17367,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               7281E0881DFD06480021E1B7 /* Foundation.framework in Frameworks */,
-                               DC52EDB21D80D59700B0A59C /* IDSFoundation.framework in Frameworks */,
-                               DC52EDAC1D80D58400B0A59C /* IDS.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14545,13 +17402,16 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC5ABE191D832F2700CF422C /* CoreFoundation.framework in Frameworks */,
                        buildActionMask = 2147483647;
                        files = (
                                DC5ABE191D832F2700CF422C /* CoreFoundation.framework in Frameworks */,

+                               BE64A7FA22AF006F001209F3 /* SecurityFoundation.framework in Frameworks */,

                                DC5ABE181D832F2200CF422C /* Security.framework in Frameworks */,
                                DC5ABE181D832F2200CF422C /* Security.framework in Frameworks */,

-                               DCD22D581D8CC1FA001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D581D8CC1FA001C9B81 /* libASN1.a in Frameworks */,

                                DCD22D5C1D8CC224001C9B81 /* libutilities.a in Frameworks */,
                                DCB7D8D01D8E183C00867385 /* libsecurity_utilities.a in Frameworks */,
                                DCD22D591D8CC200001C9B81 /* libsecurity_cdsa_client.a in Frameworks */,
                                DCD22D5A1D8CC205001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */,
                                DCD22D5B1D8CC20D001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */,
                                DCD22D5C1D8CC224001C9B81 /* libutilities.a in Frameworks */,
                                DCB7D8D01D8E183C00867385 /* libsecurity_utilities.a in Frameworks */,
                                DCD22D591D8CC200001C9B81 /* libsecurity_cdsa_client.a in Frameworks */,
                                DCD22D5A1D8CC205001C9B81 /* libsecurity_cdsa_utilities.a in Frameworks */,
                                DCD22D5B1D8CC20D001C9B81 /* libsecurity_cdsa_utils.a in Frameworks */,

+                               BE64A7FC22AF008D001209F3 /* Foundation.framework in Frameworks */,
+                               BEC6A9162331992900080069 /* Network.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14566,7 +17426,6 @@
                                DC5AC0D41D83547A00CF422C /* libsecuritydservice_client.a in Frameworks */,
                                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */,
                                BEE523DC1DACAA9200DD0AA3 /* libz.dylib in Frameworks */,
                                DC5AC0D41D83547A00CF422C /* libsecuritydservice_client.a in Frameworks */,
                                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */,
                                BEE523DC1DACAA9200DD0AA3 /* libz.dylib in Frameworks */,

-                               DC5AC0D21D83544800CF422C /* libauto.dylib in Frameworks */,

                                DC1002AF1D8E18870025549C /* libsecurity_codesigning.a in Frameworks */,
                                DCB7D8D11D8E185900867385 /* libsecurity_utilities.a in Frameworks */,
                                DCD22D6C1D8CC6FD001C9B81 /* libsecurityd_client.a in Frameworks */,
                                DC1002AF1D8E18870025549C /* libsecurity_codesigning.a in Frameworks */,
                                DCB7D8D11D8E185900867385 /* libsecurity_utilities.a in Frameworks */,
                                DCD22D6C1D8CC6FD001C9B81 /* libsecurityd_client.a in Frameworks */,


@@ -14577,10 +17436,9 @@
                                DC5AC0C91D8353D100CF422C /* libbsm.dylib in Frameworks */,
                                DCD22D701D8CC733001C9B81 /* libutilities.a in Frameworks */,
                                DC63D70820B3931100D088AD /* libxar.tbd in Frameworks */,
                                DC5AC0C91D8353D100CF422C /* libbsm.dylib in Frameworks */,
                                DCD22D701D8CC733001C9B81 /* libutilities.a in Frameworks */,
                                DC63D70820B3931100D088AD /* libxar.tbd in Frameworks */,

-                               DC72BCD720B3A7DF00B26495 /* libOpenScriptingUtil.tbd in Frameworks */,
-                               DC5AC0C71D8353C800CF422C /* PCSC.framework in Frameworks */,

                                DC5AC0C51D8353C200CF422C /* Security.framework in Frameworks */,
                                DC5AC0C41D8353BB00CF422C /* System.framework in Frameworks */,
                                DC5AC0C51D8353C200CF422C /* Security.framework in Frameworks */,
                                DC5AC0C41D8353BB00CF422C /* System.framework in Frameworks */,

+                               D4E6D8592404EAD40074CB26 /* libDER.a in Frameworks */,

                                DC5AC0C21D83538D00CF422C /* CoreFoundation.framework in Frameworks */,
                                DC5AC0C11D83538800CF422C /* IOKit.framework in Frameworks */,
                        );
                                DC5AC0C21D83538D00CF422C /* CoreFoundation.framework in Frameworks */,
                                DC5AC0C11D83538800CF422C /* IOKit.framework in Frameworks */,
                        );


@@ -14590,19 +17448,24 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               0C570B8123F3A1EC001FEB3B /* CoreCDP.framework in Frameworks */,
+                               D47AB2D62357955F005A3801 /* Network.framework in Frameworks */,
+                               DCF46573220114F000BA6EEA /* CloudServices.framework in Frameworks */,
+                               EB80DE56219600C6005B10FA /* libz.tbd in Frameworks */,
+                               DC9C066F2149E36900C6F7B8 /* AuthKit.framework in Frameworks */,

                                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */,
                                0CA4EC10202BB5AF002B1D96 /* Accounts.framework in Frameworks */,
                                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */,
                                474B5FC81E662E79007546F8 /* SecurityFoundation.framework in Frameworks */,
                                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */,
                                DC4EA5961E70A237008840B4 /* libsecurity.a in Frameworks */,
                                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */,
                                0CA4EC10202BB5AF002B1D96 /* Accounts.framework in Frameworks */,
                                47B90C901F350966006500BC /* CrashReporterSupport.framework in Frameworks */,
                                474B5FC81E662E79007546F8 /* SecurityFoundation.framework in Frameworks */,
                                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */,
                                DC4EA5961E70A237008840B4 /* libsecurity.a in Frameworks */,

+                               D49BD07824770E2D00FC7E1C /* libMobileGestalt.tbd in Frameworks */,

                                6C5B36BA1E2F9B95008AD443 /* WirelessDiagnostics.framework in Frameworks */,
                                DC610A3D1D78F25C002223DE /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                DC610A3B1D78F234002223DE /* libACM.a in Frameworks */,
                                6C5B36BA1E2F9B95008AD443 /* WirelessDiagnostics.framework in Frameworks */,
                                DC610A3D1D78F25C002223DE /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                DC610A3B1D78F234002223DE /* libACM.a in Frameworks */,

-                               DC610A391D78F1B7002223DE /* libaks.a in Frameworks */,

                                DC610A2C1D78F129002223DE /* libaks_acl.a in Frameworks */,
                                D46246B91F9AE79000D63882 /* libDER.a in Frameworks */,
                                DC610A2C1D78F129002223DE /* libaks_acl.a in Frameworks */,
                                D46246B91F9AE79000D63882 /* libDER.a in Frameworks */,

-                               DCD22D601D8CC2EF001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D601D8CC2EF001C9B81 /* libASN1.a in Frameworks */,

                                DCD22D611D8CC2F8001C9B81 /* libbsm.dylib in Frameworks */,
                                DC610A2B1D78F129002223DE /* libcoreauthd_test_client.a in Frameworks */,
                                DC610A2F1D78F129002223DE /* libctkclient_test.a in Frameworks */,
                                DCD22D611D8CC2F8001C9B81 /* libbsm.dylib in Frameworks */,
                                DC610A2B1D78F129002223DE /* libcoreauthd_test_client.a in Frameworks */,
                                DC610A2F1D78F129002223DE /* libctkclient_test.a in Frameworks */,


@@ -14616,7 +17479,6 @@
                                DC00ABE81D821F7D00513D74 /* libsecurityd_ios.a in Frameworks */,
                                D40B6A901E2B673500CD6EE5 /* libtrustd.a in Frameworks */,
                                DCD22D631D8CC33A001C9B81 /* libSOSRegressions.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 */,
                                DCD22D641D8CC341001C9B81 /* libutilities.a in Frameworks */,
                                DCD22D651D8CC349001C9B81 /* libutilitiesRegressions.a in Frameworks */,
                                DCDCCB3A1DF25D1D006E840E /* ApplePushService.framework in Frameworks */,


@@ -14629,6 +17491,7 @@
                                DCD22D6B1D8CC685001C9B81 /* AppleSystemInfo.framework in Frameworks */,
                                DC610A291D78F129002223DE /* IOKit.framework in Frameworks */,
                                DC610A271D78F129002223DE /* Security.framework in Frameworks */,
                                DCD22D6B1D8CC685001C9B81 /* AppleSystemInfo.framework in Frameworks */,
                                DC610A291D78F129002223DE /* IOKit.framework in Frameworks */,
                                DC610A271D78F129002223DE /* Security.framework in Frameworks */,

+                               DA3862AE23AAE65E001E21F1 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14663,7 +17526,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC71D9DB1D95BA6C0065FB93 /* Frameworks */ = {
+               DC7FC44521EE914C003C39B8 /* Frameworks */ = {

                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (


@@ -14677,6 +17540,32 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC99B87A20EACA470065B73B /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0CD5040523F39DEA0036C279 /* CoreCDP.framework in Frameworks */,
+                               DCF465762201162800BA6EEA /* CloudServices.framework in Frameworks */,
+                               DC3E18C82125015300073D80 /* libsecurityd_ios.a in Frameworks */,
+                               DCCFB14E212394EC003D2DA2 /* libaks_mock.a in Frameworks */,
+                               DC99B87B20EACA470065B73B /* libbsm.tbd in Frameworks */,
+                               DC99B87C20EACA470065B73B /* libz.tbd in Frameworks */,
+                               DC99B87F20EACA470065B73B /* libDER.a in Frameworks */,
+                               EBCC31B1228CF0FD000AF5D9 /* libMobileGestalt.tbd in Frameworks */,
+                               DC9C06722149E6F500C6F7B8 /* AuthKit.framework in Frameworks */,
+                               DC99B88220EACA470065B73B /* CloudKit.framework in Frameworks */,
+                               0CE780AF2142F1350049340E /* KeychainCircle.framework in Frameworks */,
+                               DC99B88320EACA470065B73B /* SystemConfiguration.framework in Frameworks */,
+                               DC99B88420EACA470065B73B /* SecurityFoundation.framework in Frameworks */,
+                               DC99B88520EACA470065B73B /* TrustedPeers.framework in Frameworks */,
+                               DC99B88620EACA470065B73B /* IOKit.framework in Frameworks */,
+                               DC99B88920EACA470065B73B /* libSecureObjectSyncServer.a in Frameworks */,
+                               DC99B88A20EACA470065B73B /* libutilities.a in Frameworks */,
+                               DC99B88B20EACA470065B73B /* libASN1.a in Frameworks */,
+                               DA3862A923AAD1FD001E21F1 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCB340691D8A24DF0054D16E /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DCB340691D8A24DF0054D16E /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14719,6 +17608,36 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DCBF4AC021FFC82100539F0A /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCBF4AC221FFC82100539F0A /* libutilities.a in Frameworks */,
+                               DCBF4AC321FFC82100539F0A /* Accounts.framework in Frameworks */,
+                               DCBF4AC421FFC82100539F0A /* AppleAccount.framework in Frameworks */,
+                               DCBF4AC521FFC82100539F0A /* AuthKit.framework in Frameworks */,
+                               DCAB17DB2200E7A700E1DFCF /* CloudServices.framework in Frameworks */,
+                               DCBF4AC621FFC82100539F0A /* libDER.a in Frameworks */,
+                               DCBF4AC721FFC82100539F0A /* SecurityFoundation.framework in Frameworks */,
+                               DCBF4AC821FFC82100539F0A /* libASN1.a in Frameworks */,
+                               DCBF4AC921FFC82100539F0A /* libSecureObjectSyncServer.a in Frameworks */,
+                               DCBF4ACA21FFC82100539F0A /* libsecurityd_ios.a in Frameworks */,
+                               DCBF4ACB21FFC82100539F0A /* CFNetwork.framework in Frameworks */,
+                               DCBF4ACC21FFC82100539F0A /* CoreData.framework in Frameworks */,
+                               DCBF4ACD21FFC82100539F0A /* Foundation.framework in Frameworks */,
+                               DCBF4ACE21FFC82100539F0A /* IOKit.framework in Frameworks */,
+                               DCBF4ACF21FFC82100539F0A /* OCMock.framework in Frameworks */,
+                               DCBF4AD021FFC82100539F0A /* SystemConfiguration.framework in Frameworks */,
+                               DCBF4AD121FFC82100539F0A /* libACM.a in Frameworks */,
+                               DCBF4AD221FFC82100539F0A /* libaks_acl.a in Frameworks */,
+                               DCBF4AD321FFC82100539F0A /* libbsm.dylib in Frameworks */,
+                               DCBF4AD421FFC82100539F0A /* libcoreauthd_client.a in Frameworks */,
+                               DCBF4AD521FFC82100539F0A /* libctkclient_sep.a in Frameworks */,
+                               DCBF4AD621FFC82100539F0A /* libsqlite3.0.dylib in Frameworks */,
+                               DCBF4AD721FFC82100539F0A /* libz.dylib in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCC78EA61D8088E200865A7C /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DCC78EA61D8088E200865A7C /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -14791,7 +17710,12 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C0582AE20D9657800D7BD7A /* CoreCDP.framework in Frameworks */,
+                               0C570B7B23F3A09A001FEB3B /* CoreCDP.framework in Frameworks */,
+                               DC4A76AE22126C49006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB80DE38219600A8005B10FA /* libz.tbd in Frameworks */,
+                               482FE5642177C6850031C11E /* libprequelite.tbd in Frameworks */,
+                               482FE5632177C5E80031C11E /* Accounts.framework in Frameworks */,
+                               482FE5602177C5DA0031C11E /* AuthKit.framework in Frameworks */,

                                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                DCE4E6AE1D7A3C6A00AFB96E /* AppleSystemInfo.framework in Frameworks */,
                                DCE4E6AD1D7A3B9700AFB96E /* libaks.a in Frameworks */,
                                6C1F93111DD5E41A00585608 /* libDiagnosticMessagesClient.dylib in Frameworks */,
                                DCE4E6AE1D7A3C6A00AFB96E /* AppleSystemInfo.framework in Frameworks */,
                                DCE4E6AD1D7A3B9700AFB96E /* libaks.a in Frameworks */,


@@ -14801,8 +17725,6 @@
                                DC65E7BD1D8CBA6C00152EF0 /* libsecurityd_ios.a in Frameworks */,
                                DC65E7781D8CB8A500152EF0 /* libSecureObjectSyncServer.a in Frameworks */,
                                DC00AB971D821D7100513D74 /* libSOSCommands.a in Frameworks */,
                                DC65E7BD1D8CBA6C00152EF0 /* libsecurityd_ios.a in Frameworks */,
                                DC65E7781D8CB8A500152EF0 /* libSecureObjectSyncServer.a in Frameworks */,
                                DC00AB971D821D7100513D74 /* libSOSCommands.a in Frameworks */,

-                               DC00AB981D821D7400513D74 /* libSecurityTool.a in Frameworks */,
-                               DC00AB991D821D7700513D74 /* libSecurityCommands.a in Frameworks */,

                                DC65E7371D8CB37500152EF0 /* libutilities.a in Frameworks */,
                                DC65E77A1D8CB8D200152EF0 /* libsqlite3.dylib in Frameworks */,
                                DCE4E69B1D7A37FA00AFB96E /* libaks_acl.a in Frameworks */,
                                DC65E7371D8CB37500152EF0 /* libutilities.a in Frameworks */,
                                DC65E77A1D8CB8D200152EF0 /* libsqlite3.dylib in Frameworks */,
                                DCE4E69B1D7A37FA00AFB96E /* libaks_acl.a in Frameworks */,


@@ -14814,7 +17736,6 @@
                                DCE4E6A01D7A37FA00AFB96E /* Foundation.framework in Frameworks */,
                                DC65E77B1D8CB8E800152EF0 /* IOKit.framework in Frameworks */,
                                DC65E77C1D8CB8F100152EF0 /* MobileKeyBag.framework in Frameworks */,
                                DCE4E6A01D7A37FA00AFB96E /* Foundation.framework in Frameworks */,
                                DC65E77B1D8CB8E800152EF0 /* IOKit.framework in Frameworks */,
                                DC65E77C1D8CB8F100152EF0 /* MobileKeyBag.framework in Frameworks */,

-                               DCD8A2011E09FAD900E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14822,7 +17743,9 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D47AB2D02356B2F6005A3801 /* Network.framework in Frameworks */,

                                09EF431B21A5A8CC0066CF20 /* libaks_acl.a in Frameworks */,
                                09EF431B21A5A8CC0066CF20 /* libaks_acl.a in Frameworks */,

+                               097CE59F246966A100958AF8 /* libMobileGestalt.dylib in Frameworks */,

                                D4C6C5CD1FB3B423007EA57E /* libarchive.tbd in Frameworks */,
                                D46246B71F9AE76500D63882 /* libDER.a in Frameworks */,
                                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */,
                                D4C6C5CD1FB3B423007EA57E /* libarchive.tbd in Frameworks */,
                                D46246B71F9AE76500D63882 /* libDER.a in Frameworks */,
                                DC3A81EC1D99F568000C7419 /* libcoretls.dylib in Frameworks */,


@@ -14834,11 +17757,10 @@
                                DCE4E7541D7A43B500AFB96E /* Foundation.framework in Frameworks */,
                                DCE4E7681D7A43B500AFB96E /* IOKit.framework in Frameworks */,
                                DC65E7751D8CB81000152EF0 /* libregressionBase.a in Frameworks */,
                                DCE4E7541D7A43B500AFB96E /* Foundation.framework in Frameworks */,
                                DCE4E7681D7A43B500AFB96E /* IOKit.framework in Frameworks */,
                                DC65E7751D8CB81000152EF0 /* libregressionBase.a in Frameworks */,

-                               DC26710E1F3E932D00816EED /* libASN1_not_installed.a in Frameworks */,
+                               DC26710E1F3E932D00816EED /* libASN1.a in Frameworks */,

                                DC00ABC71D821EF400513D74 /* libSharedRegressions.a in Frameworks */,
                                DCD22D551D8CC148001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */,
                                DC00ABC71D821EF400513D74 /* libSharedRegressions.a in Frameworks */,
                                DCD22D551D8CC148001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */,

-                               DC63CAF81D91A15F00C03317 /* libsecurity_cms_regressions.a in Frameworks */,
-                               DCE4E7C41D7A465500AFB96E /* libsecurity_smime_regressions.a in Frameworks */,
+                               D4D1FDE32116608B003538E2 /* libsecurity_cms_regressions.a in Frameworks */,

                                DCD22D571D8CC196001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */,
                                ACBAF6FC1E941B620007BA2F /* libsecurity_transform_regressions.a in Frameworks */,
                                DCD22D561D8CC154001C9B81 /* libutilities.a in Frameworks */,
                                DCD22D571D8CC196001C9B81 /* libsecurity_ssl_regressions.a in Frameworks */,
                                ACBAF6FC1E941B620007BA2F /* libsecurity_transform_regressions.a in Frameworks */,
                                DCD22D561D8CC154001C9B81 /* libutilities.a in Frameworks */,


@@ -14858,8 +17780,7 @@
                                DCE4E7EB1D7A4BB200AFB96E /* SecurityFoundation.framework in Frameworks */,
                                DCE4E7EA1D7A4BAE00AFB96E /* CoreFoundation.framework in Frameworks */,
                                DCD22D5E1D8CC269001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */,
                                DCE4E7EB1D7A4BB200AFB96E /* SecurityFoundation.framework in Frameworks */,
                                DCE4E7EA1D7A4BAE00AFB96E /* CoreFoundation.framework in Frameworks */,
                                DCD22D5E1D8CC269001C9B81 /* libsecurity_keychain_regressions.a in Frameworks */,

-                               DCE4E7E81D7A4BA400AFB96E /* libsecurity_smime_regressions.a in Frameworks */,
-                               DC0B622A1D9097C600D43BCB /* libsecurity_cms_regressions.a in Frameworks */,
+                               D4D1FDE521166135003538E2 /* libsecurity_cms_regressions.a in Frameworks */,

                                DCE4E7E71D7A4B9C00AFB96E /* IOKit.framework in Frameworks */,
                                DCDCC8331D9B6A00006487E8 /* libcoretls.dylib in Frameworks */,
                        );
                                DCE4E7E71D7A4B9C00AFB96E /* IOKit.framework in Frameworks */,
                                DCDCC8331D9B6A00006487E8 /* libcoretls.dylib in Frameworks */,
                        );


@@ -14869,6 +17790,11 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DC8E3DC4224460C6003D86DB /* TrustedPeers.framework in Frameworks */,
+                               DCF46570220110C900BA6EEA /* CloudServices.framework in Frameworks */,
+                               EB80DE54219600B4005B10FA /* libz.tbd in Frameworks */,
+                               DCC19518214C53FD00C9E0B6 /* AuthKit.framework in Frameworks */,
+                               DCC1951C214C668A00C9E0B6 /* AppleAccount.framework in Frameworks */,

                                0CA4EC11202BB5E9002B1D96 /* Accounts.framework in Frameworks */,
                                0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */,
                                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */,
                                0CA4EC11202BB5E9002B1D96 /* Accounts.framework in Frameworks */,
                                0C5960641FB2E2070095BA29 /* libprequelite.tbd in Frameworks */,
                                4710A6D91F34F21700745267 /* CrashReporterSupport.framework in Frameworks */,


@@ -14881,13 +17807,11 @@
                                DCE4E8251D7A4EE400AFB96E /* libACM.a in Frameworks */,
                                DCE4E8241D7A4ECD00AFB96E /* libaks.a in Frameworks */,
                                DCE4E8231D7A4EC900AFB96E /* libaks_acl.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 */,
+                               DCD22D711D8CC78E001C9B81 /* libASN1.a in Frameworks */,

                                DCE4E8201D7A4EAC00AFB96E /* libcoreauthd_client.a in Frameworks */,
                                DCE4E81F1D7A4EA700AFB96E /* libctkclient_sep.a in Frameworks */,
                                DCE4E81C1D7A4E8F00AFB96E /* libsqlite3.0.dylib in Frameworks */,
                                DCE4E8201D7A4EAC00AFB96E /* libcoreauthd_client.a in Frameworks */,
                                DCE4E81F1D7A4EA700AFB96E /* libctkclient_sep.a in Frameworks */,
                                DCE4E81C1D7A4E8F00AFB96E /* libsqlite3.0.dylib in Frameworks */,

-                               DCD8A2041E09FB0D00E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,

                                DC00AB7A1D821C6B00513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DC00AB7A1D821C6B00513D74 /* libSecureObjectSyncServer.a in Frameworks */,

-                               DC00AB7B1D821C6E00513D74 /* libsecurity.a in Frameworks */,

                                DC65E7271D8CB2EC00152EF0 /* libutilities.a in Frameworks */,
                                DC00AB7C1D821C7100513D74 /* libsecurityd_ios.a in Frameworks */,
                                DCE4E8131D7A4E5300AFB96E /* CoreFoundation.framework in Frameworks */,
                                DC65E7271D8CB2EC00152EF0 /* libutilities.a in Frameworks */,
                                DC00AB7C1D821C7100513D74 /* libsecurityd_ios.a in Frameworks */,
                                DCE4E8131D7A4E5300AFB96E /* CoreFoundation.framework in Frameworks */,


@@ -14899,6 +17823,7 @@
                                DCD504C320CB293700F37D26 /* Security.framework in Frameworks */,
                                DC4DB16A1E26E9F900CD6769 /* ProtocolBuffer.framework in Frameworks */,
                                DCE4E82C1D7A56FF00AFB96E /* AppleSystemInfo.framework in Frameworks */,
                                DCD504C320CB293700F37D26 /* Security.framework in Frameworks */,
                                DC4DB16A1E26E9F900CD6769 /* ProtocolBuffer.framework in Frameworks */,
                                DCE4E82C1D7A56FF00AFB96E /* AppleSystemInfo.framework in Frameworks */,

+                               DA53FC3923A9BA68002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14909,17 +17834,18 @@
                                D46246D41F9AEAE300D63882 /* libDER.a in Frameworks */,
                                D40B6A9A1E2B68E800CD6EE5 /* libbsm.dylib in Frameworks */,
                                D40B6A991E2B68A400CD6EE5 /* libz.dylib in Frameworks */,
                                D46246D41F9AEAE300D63882 /* libDER.a in Frameworks */,
                                D40B6A9A1E2B68E800CD6EE5 /* libbsm.dylib in Frameworks */,
                                D40B6A991E2B68A400CD6EE5 /* libz.dylib in Frameworks */,

-                               D40B6A981E2B687F00CD6EE5 /* libDiagnosticMessagesClient.dylib in Frameworks */,

                                D40B6A971E2B684900CD6EE5 /* libsqlite3.0.dylib in Frameworks */,
                                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */,
                                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */,
                                D40B6A971E2B684900CD6EE5 /* libsqlite3.0.dylib in Frameworks */,
                                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */,
                                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */,

-                               D40B6A831E2B5F5B00CD6EE5 /* libASN1_not_installed.a in Frameworks */,
-                               D40B6A9D1E2B6A2700CD6EE5 /* login.framework in Frameworks */,
+                               D40B6A831E2B5F5B00CD6EE5 /* libASN1.a in Frameworks */,
+                               D4981B8F24F723EA004B033B /* IOKit.framework in Frameworks */,

                                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */,
                                D4ADA3311E2B43450031CEA3 /* CFNetwork.framework in Frameworks */,

+                               D47AB2CC2356AD7C005A3801 /* Network.framework in Frameworks */,

                                D4ADA3301E2B433B0031CEA3 /* Security.framework in Frameworks */,
                                D4ADA32E1E2B43220031CEA3 /* CoreFoundation.framework in Frameworks */,
                                D4ADA32F1E2B43220031CEA3 /* Foundation.framework in Frameworks */,
                                D4C7CD661E71E92D00139817 /* MobileAsset.framework in Frameworks */,
                                D4ADA3301E2B433B0031CEA3 /* Security.framework in Frameworks */,
                                D4ADA32E1E2B43220031CEA3 /* CoreFoundation.framework in Frameworks */,
                                D4ADA32F1E2B43220031CEA3 /* Foundation.framework in Frameworks */,
                                D4C7CD661E71E92D00139817 /* MobileAsset.framework in Frameworks */,

+                               DA2F592123A9874800C30285 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14927,13 +17853,16 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               5E01F5B1227C859200BC884C /* Foundation.framework in Frameworks */,

                                DCE4E8C91D7F356500AFB96E /* libsqlite3.dylib in Frameworks */,
                                DCE4E8C81D7F355F00AFB96E /* libbsm.dylib in Frameworks */,
                                DCE4E8C91D7F356500AFB96E /* libsqlite3.dylib in Frameworks */,
                                DCE4E8C81D7F355F00AFB96E /* libbsm.dylib in Frameworks */,

+                               F6F4105324AC622F00369037 /* libaks.a in Frameworks */,

                                DCE4E8C71D7F355900AFB96E /* 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 */,
                                DCE4E8C71D7F355900AFB96E /* 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 */,

+                               DA2F591E23A986A300C30285 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -14952,7 +17881,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C0582B820D9B70D00D7BD7A /* CoreCDP.framework in Frameworks */,
+                               0C570B7923F3A015001FEB3B /* CoreCDP.framework in Frameworks */,

                                CD112FC51DDA31AD00C77A07 /* Accounts.framework in Frameworks */,
                                0CC319241DA46FBF005D42EA /* ProtectedCloudStorage.framework in Frameworks */,
                                DCE4E9401D7F3E4D00AFB96E /* Security.framework in Frameworks */,
                                CD112FC51DDA31AD00C77A07 /* Accounts.framework in Frameworks */,
                                0CC319241DA46FBF005D42EA /* ProtectedCloudStorage.framework in Frameworks */,
                                DCE4E9401D7F3E4D00AFB96E /* Security.framework in Frameworks */,


@@ -14965,6 +17894,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DCF216D521ADD5B10029CCC1 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCF783101D88B4DE00E694BB /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                DCF783101D88B4DE00E694BB /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -15014,10 +17950,38 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               E060D1992124780E0025B833 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1A42124780F0025B833 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1B4212478110025B833 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB8A9381233C900D0015A794 /* CloudServices.framework in Frameworks */,
+                               EBFF95EF214C823F0021CD14 /* KeychainCircle.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                E710C73F1331946400F85568 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                E710C73F1331946400F85568 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               0C147A2823F39CD10034F08B /* CoreCDP.framework in Frameworks */,
+                               D47AB2CF2356B2ED005A3801 /* Network.framework in Frameworks */,
+                               DC4A76A62212691F006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB80DE5C2196010F005B10FA /* libz.tbd in Frameworks */,
+                               482FE56D2177CF150031C11E /* AuthKit.framework in Frameworks */,

                                D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */,
                                D40B6A8F1E2B643D00CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABC01D821EBE00513D74 /* libSharedRegressions.a in Frameworks */,
                                D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */,
                                D40B6A8F1E2B643D00CD6EE5 /* libtrustd.a in Frameworks */,
                                DC00ABC01D821EBE00513D74 /* libSharedRegressions.a in Frameworks */,


@@ -15030,7 +17994,7 @@
                                DC00ABC21D821EC600513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1F31E09F91700E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                D46246B61F9AE75100D63882 /* libDER.a in Frameworks */,
                                DC00ABC21D821EC600513D74 /* libSecureObjectSyncServer.a in Frameworks */,
                                DCD8A1F31E09F91700E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,
                                D46246B61F9AE75100D63882 /* libDER.a in Frameworks */,

-                               DCD22D931D8CCD17001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D931D8CCD17001C9B81 /* libASN1.a in Frameworks */,

                                DCD22D941D8CCDFA001C9B81 /* libutilities.a in Frameworks */,
                                DC17890B1D77980500B50D50 /* Security.framework in Frameworks */,
                                438168BF1B4ED42C00C54D58 /* CoreFoundation.framework in Frameworks */,
                                DCD22D941D8CCDFA001C9B81 /* libutilities.a in Frameworks */,
                                DC17890B1D77980500B50D50 /* Security.framework in Frameworks */,
                                438168BF1B4ED42C00C54D58 /* CoreFoundation.framework in Frameworks */,


@@ -15048,6 +18012,7 @@
                                E71F3E4116EA6A5100FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                D418CC711E690CBC00330A44 /* MobileAsset.framework in Frameworks */,
                                0CFC029C1D41650700E6283B /* libcoretls.dylib in Frameworks */,
                                E71F3E4116EA6A5100FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                D418CC711E690CBC00330A44 /* MobileAsset.framework in Frameworks */,
                                0CFC029C1D41650700E6283B /* libcoretls.dylib in Frameworks */,

+                               DA53FC4423A9C779002D5EA9 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -15076,10 +18041,10 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               5A47FFBE228F6D1B00F781B8 /* ProtocolBuffer.framework in Frameworks */,

                                EB59D6731E95F01600997EAC /* libcompression.dylib in Frameworks */,
                                DC65E7231D8CB28900152EF0 /* libutilities.a in Frameworks */,
                                EB59D6731E95F01600997EAC /* libcompression.dylib in Frameworks */,
                                DC65E7231D8CB28900152EF0 /* libutilities.a in Frameworks */,

-                               E7D8489F1C6C244B0025BB44 /* Foundation.framework in Frameworks */,
-                               E7650E6F1C7699DA00378669 /* Security.framework in Frameworks */,
+                               D4F56B95217FC93500FCA6B7 /* Security.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -15093,49 +18058,10 @@
                                E7D848561C6C1E830025BB44 /* Foundation.framework in Frameworks */,
                                DCDCCB361DF25C8D006E840E /* ApplePushService.framework in Frameworks */,
                                E7F482E61C7640D300390FDB /* IOKit.framework in Frameworks */,
                                E7D848561C6C1E830025BB44 /* Foundation.framework in Frameworks */,
                                DCDCCB361DF25C8D006E840E /* ApplePushService.framework in Frameworks */,
                                E7F482E61C7640D300390FDB /* IOKit.framework in Frameworks */,

-                               DC00ABA51D821DCD00513D74 /* libsecurity.a in Frameworks */,
-                               DCD8A1F61E09F96900E4FA0A /* libSecureObjectSyncFramework.a in Frameworks */,

                                DCD22D541D8CC0FC001C9B81 /* libutilities.a in Frameworks */,
                                DCD22D541D8CC0FC001C9B81 /* libutilities.a in Frameworks */,

-                               DCD22D531D8CC0EF001C9B81 /* libASN1_not_installed.a in Frameworks */,
+                               DCD22D531D8CC0EF001C9B81 /* libASN1.a in Frameworks */,

                                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */,
                                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */,
                                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */,
                                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */,

-                               E7F482A61C75453900390FDB /* libcoreauthd_test_client.a in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               EB056E3B1FE5E390000A771E /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBCE16411FE6DE5A002E7CCC /* libDER.a in Frameworks */,
-                               EBCE16421FE6DE5A002E7CCC /* SecurityFoundation.framework in Frameworks */,
-                               EBCE16431FE6DE5A002E7CCC /* libASN1_not_installed.a in Frameworks */,
-                               EBCE165D1FE71821002E7CCC /* libsecurityd_ios.a in Frameworks */,
-                               EBCE16451FE6DE5A002E7CCC /* libSecureObjectSyncFramework.a in Frameworks */,
-                               EBCE16461FE6DE5A002E7CCC /* libSecureObjectSyncServer.a in Frameworks */,
-                               EBCE16471FE6DE5A002E7CCC /* libsecurity.a in Frameworks */,
-                               EBCE16481FE6DE5A002E7CCC /* libutilities.a in Frameworks */,
-                               EBCE16491FE6DE5A002E7CCC /* CFNetwork.framework in Frameworks */,
-                               EBCE164B1FE6DE5A002E7CCC /* Foundation.framework in Frameworks */,
-                               EBCE164C1FE6DE5A002E7CCC /* IOKit.framework in Frameworks */,
-                               EBCE164E1FE6DE5A002E7CCC /* SystemConfiguration.framework in Frameworks */,
-                               EBCE164F1FE6DE5A002E7CCC /* libACM.a in Frameworks */,
-                               EBCE16501FE6DE5A002E7CCC /* libaks_acl.a in Frameworks */,
-                               EBCE16511FE6DE5A002E7CCC /* libbsm.dylib in Frameworks */,
-                               EBCE16521FE6DE5A002E7CCC /* libcoreauthd_client.a in Frameworks */,
-                               EBCE16531FE6DE5A002E7CCC /* libctkclient_sep.a in Frameworks */,
-                               EBCE16541FE6DE5A002E7CCC /* libprequelite.tbd in Frameworks */,
-                               EBCE16551FE6DE5A002E7CCC /* libsqlite3.0.dylib in Frameworks */,
-                               D4911171209559620066A1E4 /* CoreData.framework in Frameworks */,
-                               EBCE16561FE6DE5A002E7CCC /* libz.dylib in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               EB05C4EE1FE5E48A00D68712 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBCE166B1FE74688002E7CCC /* Foundation.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -15166,12 +18092,9 @@
                                EBA689031E74732700FF90A7 /* Foundation.framework in Frameworks */,
                                EB75B4881E75401700E469CC /* ApplePushService.framework in Frameworks */,
                                EB75B4891E75402400E469CC /* IOKit.framework in Frameworks */,
                                EBA689031E74732700FF90A7 /* Foundation.framework in Frameworks */,
                                EB75B4881E75401700E469CC /* ApplePushService.framework in Frameworks */,
                                EB75B4891E75402400E469CC /* IOKit.framework in Frameworks */,

-                               EB75B48A1E75405100E469CC /* libsecurity.a in Frameworks */,

                                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */,
                                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */,

-                               EB75B48D1E75408900E469CC /* libASN1_not_installed.a in Frameworks */,
+                               EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */,

                                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */,
                                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */,

-                               EB75B4901E7540AA00E469CC /* libctkclient_test.a in Frameworks */,
-                               EB75B4911E7540BF00E469CC /* libcoreauthd_test_client.a in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -15216,19 +18139,67 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DCAAF3362493F9C600D4EB55 /* LocalAuthentication.framework in Frameworks */,
+                               0CCC22D823F39BCA00E1FCD0 /* CoreCDP.framework in Frameworks */,
+                               DC4A76AC221269E4006F2D8F /* CloudServices.framework in Frameworks */,
+                               EB49B2BB202D8894003F34A0 /* libsecurityd_ios.a in Frameworks */,
+                               EB49B2DD202DF259003F34A0 /* libbsm.tbd in Frameworks */,
+                               EB80DE59219600DF005B10FA /* libz.tbd in Frameworks */,

                                EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */,
                                EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */,

-                               EB49B2BD202DEF29003F34A0 /* libSecureObjectSyncFramework.a in Frameworks */,
+                               482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */,

                                EB49B2BE202DEF29003F34A0 /* libSecureObjectSyncServer.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 */,
+                               EB49B2C1202DEF8D003F34A0 /* libASN1.a in Frameworks */,

                                EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */,
                                EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */,
                                EB49B2D2202DF17D003F34A0 /* SecurityFoundation.framework in Frameworks */,
                                EB49B2CD202DF0F9003F34A0 /* SystemConfiguration.framework in Frameworks */,
                                EB49B2C7202DF0E9003F34A0 /* IOKit.framework in Frameworks */,
                                EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */,
                                EB49B308202FF421003F34A0 /* OCMock.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 */,
                                EB49B2BC202DEF14003F34A0 /* libsqlite3.tbd in Frameworks */,

+                               DA53FC4223A9C442002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB6952AA223B75C300F02C1C /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB6952BE223B793100F02C1C /* IOKit.framework in Frameworks */,
+                               EB6952AB223B75C300F02C1C /* libz.tbd in Frameworks */,
+                               EB6952AC223B75C300F02C1C /* libMobileGestalt.dylib in Frameworks */,
+                               EB6952AD223B75C300F02C1C /* Foundation.framework in Frameworks */,
+                               EB6952AE223B75C300F02C1C /* libutilities.a in Frameworks */,
+                               EB6952AF223B75C300F02C1C /* CoreFoundation.framework in Frameworks */,
+                               EB6952B0223B75C300F02C1C /* Security.framework in Frameworks */,
+                               EB6952B1223B75C300F02C1C /* CoreData.framework in Frameworks */,
+                               EB6952B2223B75C300F02C1C /* SystemConfiguration.framework in Frameworks */,
+                               EB6952B3223B75C300F02C1C /* libsqlite3.dylib in Frameworks */,
+                               DA2F592823A99F6300C30285 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB74CC132207E48000F1BBAD /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB74CC272207ECE100F1BBAD /* Security.framework in Frameworks */,
+                               EB74CC262207ECCC00F1BBAD /* Preferences.framework in Frameworks */,
+                               EB74CC172207E48000F1BBAD /* Foundation.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB89086F21F17D3C00F0DDDB /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB89087021F17D3C00F0DDDB /* libz.tbd in Frameworks */,
+                               EB89087221F17D3C00F0DDDB /* libMobileGestalt.dylib in Frameworks */,
+                               EB89087321F17D3C00F0DDDB /* Foundation.framework in Frameworks */,
+                               EB89087421F17D3C00F0DDDB /* libutilities.a in Frameworks */,
+                               EB89087521F17D3C00F0DDDB /* CoreFoundation.framework in Frameworks */,
+                               EB89087921F17D3C00F0DDDB /* Security.framework in Frameworks */,
+                               EB89087B21F17D3C00F0DDDB /* SystemConfiguration.framework in Frameworks */,
+                               EB89087E21F17D3C00F0DDDB /* libsqlite3.dylib in Frameworks */,
+                               DA3862AC23AAE3D3001E21F1 /* SoftLinking.framework in Frameworks */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -15257,6 +18228,17 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               EBB851E922F7912400424FD0 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EBB8521D22F7948B00424FD0 /* libutilities.a in Frameworks */,
+                               EBB8521B22F7945600424FD0 /* XCTest.framework in Frameworks */,
+                               EBB852CF22F7A05600424FD0 /* OCMock.framework in Frameworks */,
+                               DA53FC4823A9CC16002D5EA9 /* SoftLinking.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                EBCF73F61CE45F9C00BED7CA /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                EBCF73F61CE45F9C00BED7CA /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;


@@ -15271,7 +18253,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC2670F61F3E714000816EED /* libSecureObjectSyncServer.a in Frameworks */,
                        buildActionMask = 2147483647;
                        files = (
                                DC2670F61F3E714000816EED /* libSecureObjectSyncServer.a in Frameworks */,

-                               DCE5DC121EA80369006308A6 /* libSOSCommands.a in Frameworks */,
+                               DC8506B62097F39100C712EC /* libSOSCommands.a in Frameworks */,

                                EBF3747E1DC057B40065D840 /* Security.framework in Frameworks */,
                                E76638A81DD679BC00B769D3 /* libutilities.a in Frameworks */,
                        );
                                EBF3747E1DC057B40065D840 /* Security.framework in Frameworks */,
                                E76638A81DD679BC00B769D3 /* libutilities.a in Frameworks */,
                        );


@@ -15297,6 +18279,37 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */

+               0C0203DE23A855B8005D0A68 /* proto */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C0203E023A8564E005D0A68 /* OTEscrowRecord.proto */,
+                               0C0D920523BFEA740070A68C /* OTCDPRecoveryInformation.proto */,
+                               0C0203E523A85780005D0A68 /* generated_source */,
+                       );
+                       name = proto;
+                       sourceTree = "<group>";
+               };
+               0C0203E523A85780005D0A68 /* generated_source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C468FEA23C7D4C8006F4582 /* OTCDPRecoveryInformation.h */,
+                               0C468FEE23C7D4CA006F4582 /* OTCDPRecoveryInformation.m */,
+                               0C468FE823C7D4C8006F4582 /* OTEscrowAuthenticationInformation.h */,
+                               0C468FEC23C7D4C9006F4582 /* OTEscrowAuthenticationInformation.m */,
+                               0C468FDE23C7D471006F4582 /* OTEscrowRecord.h */,
+                               0C468FDD23C7D471006F4582 /* OTEscrowRecord.m */,
+                               0C468FDA23C7D41D006F4582 /* OTEscrowRecordMetadata.h */,
+                               0C468FD823C7D41C006F4582 /* OTEscrowRecordMetadata.m */,
+                               0C468FDB23C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.h */,
+                               0C468FD923C7D41D006F4582 /* OTEscrowRecordMetadataClientMetadata.m */,
+                               0C468FE723C7D4C7006F4582 /* OTICDPRecordContext.h */,
+                               0C468FED23C7D4C9006F4582 /* OTICDPRecordContext.m */,
+                               0C468FE923C7D4C8006F4582 /* OTICDPRecordSilentContext.h */,
+                               0C468FEB23C7D4C9006F4582 /* OTICDPRecordSilentContext.m */,
+                       );
+                       name = generated_source;
+                       sourceTree = "<group>";
+               };

                0C0BDB30175685B000BC1A7E /* secdtests */ = {
                        isa = PBXGroup;
                        children = (
                0C0BDB30175685B000BC1A7E /* secdtests */ = {
                        isa = PBXGroup;
                        children = (


@@ -15307,6 +18320,15 @@
                        path = secdtests;
                        sourceTree = "<group>";
                };
                        path = secdtests;
                        sourceTree = "<group>";
                };

+               0C0C4F80216FB53A00C14C61 /* BottledPeer */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */,
+                               0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */,
+                       );
+                       path = BottledPeer;
+                       sourceTree = "<group>";
+               };

                0C2BCBA41D063F7D00ED7A2F /* dtlsEcho */ = {
                        isa = PBXGroup;
                        children = (
                0C2BCBA41D063F7D00ED7A2F /* dtlsEcho */ = {
                        isa = PBXGroup;
                        children = (


@@ -15317,92 +18339,89 @@
                        path = dtlsEcho;
                        sourceTree = "<group>";
                };
                        path = dtlsEcho;
                        sourceTree = "<group>";
                };

-               0C78F1C816A5E13400654E08 /* regressions */ = {
+               0C3BB3312187EC4D0018FC14 /* Categories */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               0C78F1CA16A5E1BF00654E08 /* sectask-10-sectask.c */,
-                               0C78F1CB16A5E1BF00654E08 /* sectask_ipc.defs */,
-                               0C78F1C916A5E13400654E08 /* sectask_regressions.h */,
+                               0C3BB3572188E18C0018FC14 /* OTAuthenticatedCiphertext+SF.h */,
+                               0C3BB3542188E18B0018FC14 /* OTAuthenticatedCiphertext+SF.m */,
+                               0C3BB3562188E18B0018FC14 /* OTPrivateKey+SF.h */,
+                               0C3BB3522188E18A0018FC14 /* OTPrivateKey+SF.m */,

                        );
                        );

-                       path = regressions;
+                       path = Categories;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               0C7CEA391FE9CE3900125C79 /* behavior */ = {
+               0C7382E52386379E004F98CB /* ResetCloudKeychainAccount */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               EB82A2A41FAFF26900CA64A9 /* SFBehavior.h */,
-                               EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */,
+                               0C7382F023863AD5004F98CB /* reset_ick_account */,

                        );
                        );

-                       path = behavior;
+                       path = ResetCloudKeychainAccount;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               0C8BBE831FC9DA1700580909 /* Octagon Trust */ = {
+               0C78F1C816A5E13400654E08 /* regressions */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C78F1CA16A5E1BF00654E08 /* sectask-10-sectask.c */,
+                               0C78F1CB16A5E1BF00654E08 /* sectask_ipc.defs */,
+                               0C78F1C916A5E13400654E08 /* sectask_regressions.h */,
+                       );
+                       path = regressions;
+                       sourceTree = "<group>";
+               };
+               0C8BBE831FC9DA1700580909 /* OT */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

+                               DCD33D7D220B9D98000A390B /* State Machine Machinery */,
+                               DC130B7920D04CFE0065CE61 /* Categories */,
+                               DC68527120D04A5800C61368 /* Framework */,
+                               DC68527020D04A3200C61368 /* IPC */,
+                               DCC67E2A20DDC05900A70A31 /* Operations */,

                                0CCCC7C720261D050024405E /* OT.h */,
                                0CCCC7C820261D310024405E /* OT.m */,
                                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 */,
+                               DC04707F218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.h */,
+                               DC047080218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m */,
+                               DC5060E920E2D88300925005 /* OTCuttlefishContext.h */,
+                               DC5060EA20E2D88300925005 /* OTCuttlefishContext.m */,
+                               DCF94A79222D9F2400C01744 /* OctagonCKKSPeerAdapter.h */,
+                               DCF94A7A222D9F2400C01744 /* OctagonCKKSPeerAdapter.m */,
+                               0C12B1F52138D32F00BE0A98 /* OTClientStateMachine.h */,
+                               0C12B1F02138D31600BE0A98 /* OTClientStateMachine.m */,
+                               DCC67E0C20DD7E0A00A70A31 /* OTStates.h */,
+                               DCC67E0D20DD7E0A00A70A31 /* OTStates.m */,

                                0C8BBE971FC9DA5A00580909 /* OTDefines.h */,
                                0C8BBE971FC9DA5A00580909 /* OTDefines.h */,

-                               0C8BBE921FC9DA5700580909 /* OTEscrowKeys.h */,
-                               0C8BBE961FC9DA5900580909 /* OTEscrowKeys.m */,
-                               0C8BBE8A1FC9DA5300580909 /* OTIdentity.h */,
-                               0C8BBE8D1FC9DA5400580909 /* OTIdentity.m */,
-                               0C8BBE8E1FC9DA5500580909 /* OTLocalStore.h */,
-                               0C8BBE8C1FC9DA5400580909 /* OTLocalStore.m */,
+                               EBCE06E521C6E26000FB1493 /* OTDefines.m */,
+                               0C6604782134C86500BFBBB8 /* OTDeviceInformation.h */,
+                               0C66047B2134C88C00BFBBB8 /* OTDeviceInformation.m */,
+                               5A04BAF622973E43001848A0 /* OTFollowup.h */,
+                               5A04BAF722973E43001848A0 /* OTFollowup.m */,

                                0C8BBF101FCB486B00580909 /* OTManager.h */,
                                0C8BBF0F1FCB481800580909 /* OTManager.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 */,
+                               0C8FD546214AEC650098E3FB /* OTJoiningConfiguration.h */,
+                               0C8FD549214AECD70098E3FB /* OTJoiningConfiguration.m */,
+                               0C2F337020DD647C0031A92D /* OTRamping.h */,
+                               0C2F337120DD647D0031A92D /* OTRamping.m */,
+                               DCB9475B2127562100ED9272 /* OTSOSAdapter.h */,
+                               DCB9475C2127562100ED9272 /* OTSOSAdapter.m */,
+                               DC9C06672149DFE400C6F7B8 /* OTAuthKitAdapter.h */,
+                               DC9C06682149DFE400C6F7B8 /* OTAuthKitAdapter.m */,
+                               DC19484A21812EC5007C2260 /* OTDeviceInformationAdapter.h */,
+                               DC19484B21812EC5007C2260 /* OTDeviceInformationAdapter.m */,
+                               DCC67E3120E16F3100A70A31 /* ObjCImprovements.h */,

                                BE34059B1FD71BA700933DAC /* Protocol Buffers */,
                                BE34059B1FD71BA700933DAC /* Protocol Buffers */,

-                               BEE4B1971FFDAFE600777D39 /* SFECPublicKey+SPKI.m */,
-                               BEE4B1961FFDAFE600777D39 /* SFPublicKey+SPKI.h */,

                                0C8BBEB11FC9DCAC00580909 /* tests */,
                        );
                                0C8BBEB11FC9DCAC00580909 /* tests */,
                        );

-                       name = "Octagon Trust";
+                       name = OT;
+                       path = ot;

                        sourceTree = "<group>";
                };
                0C8BBEB11FC9DCAC00580909 /* tests */ = {
                        isa = PBXGroup;
                        children = (
                        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 */,
+                               DC99B89720EAD4D20065B73B /* Octagon */,
+                               EB45ED3124749ECC008A1F6F /* OTTests-Info.plist */,
+                               EB45ED3224749ECC008A1F6F /* gen_test_plist.py */,

                        );
                        );

-                       name = tests;
+                       path = tests;

                        sourceTree = "<group>";
                };
                0C8BBEF61FCB402900580909 /* otctl */ = {
                        sourceTree = "<group>";
                };
                0C8BBEF61FCB402900580909 /* otctl */ = {


@@ -15410,26 +18429,105 @@
                        children = (
                                0C8BBEF71FCB405700580909 /* otctl.m */,
                                0C8BBEF81FCB407700580909 /* otctl-Entitlements.plist */,
                        children = (
                                0C8BBEF71FCB405700580909 /* otctl.m */,
                                0C8BBEF81FCB407700580909 /* otctl-Entitlements.plist */,

+                               DC26666821CAC32700F19960 /* OTControlCLI.h */,
+                               DC26666921CAC32700F19960 /* OTControlCLI.m */,
+                               DCF4657822011E1300BA6EEA /* EscrowRequestCLI.h */,
+                               DCF4657922011E1300BA6EEA /* EscrowRequestCLI.m */,
+                               EB1C319C2215EC9600A188BB /* otctl.1 */,

                        );
                        path = otctl;
                        sourceTree = "<group>";
                };
                        );
                        path = otctl;
                        sourceTree = "<group>";
                };

-               0CF0E2DD1F8EE37C00BD18E4 /* Signin Metrics */ = {
+               0CB582BA218915010040C5F2 /* proto */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CE15E34222DF66D00B7EAA4 /* OTRecovery.proto */,
+                               0CB582BD218915270040C5F2 /* OTAuthenticatedCiphertext.proto */,
+                               0CB582BE218915270040C5F2 /* OTBottle.proto */,
+                               0CB582BF218915280040C5F2 /* OTBottleContents.proto */,
+                               0CB582BC218915270040C5F2 /* OTPrivateKey.proto */,
+                               0CB582BB2189150C0040C5F2 /* generated */,
+                       );
+                       path = proto;
+                       sourceTree = "<group>";
+               };
+               0CB582BB2189150C0040C5F2 /* generated */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CE15E3D222DF6A700B7EAA4 /* OTRecovery.h */,
+                               0CE15E3A222DF6A600B7EAA4 /* OTRecovery.m */,
+                               0CE15E3B222DF6A700B7EAA4 /* Recovery.h */,
+                               0CE15E3C222DF6A700B7EAA4 /* Recovery.m */,
+                               0CB582C0218915380040C5F2 /* OTAuthenticatedCiphertext.h */,
+                               0CB582C5218915390040C5F2 /* OTAuthenticatedCiphertext.m */,
+                               0CB582C72189153A0040C5F2 /* OTBottle.h */,
+                               0CB582C4218915390040C5F2 /* OTBottle.m */,
+                               0CB582C2218915380040C5F2 /* OTBottleContents.h */,
+                               0CB582C62189153A0040C5F2 /* OTBottleContents.m */,
+                               0CB582C1218915380040C5F2 /* OTPrivateKey.h */,
+                               0CB582C3218915390040C5F2 /* OTPrivateKey.m */,
+                       );
+                       name = generated;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               0CCC227B23F3586F00E1FCD0 /* ot-tests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CCC229223F35D4300E1FCD0 /* OctagonTrustTests-Info.plist */,
+                               0C9A54B7250C290800FF007B /* OctagonTrustTests.h */,
+                               0CCC229F23F367D100E1FCD0 /* OctagonTrustTests-EscrowRecords.m */,
+                               0CCC22A323F36DD300E1FCD0 /* OctagonTrustTests-EscrowTestVectors.h */,
+                               0C9A54B4250C27F100FF007B /* OctagonTrustTests+Errors.m */,
+                       );
+                       path = "ot-tests";
+                       sourceTree = "<group>";
+               };
+               0CCC22CB23F3958B00E1FCD0 /* categories */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CCC22CC23F395A100E1FCD0 /* OctagonTrustEscrowRecoverer.h */,
+                       );
+                       path = categories;
+                       sourceTree = "<group>";
+               };
+               0CD743A723C3EC8000FA0EC5 /* OctagonTrust */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C9F65AC23E3ACF700B1A2C5 /* OTEscrowTranslation.h */,
+                               0C9F65AA23E3ACF700B1A2C5 /* OTEscrowTranslation.m */,
+                               0CD743A823C3EC8000FA0EC5 /* OctagonTrust.h */,
+                               0CD743B723C3ED7E00FA0EC5 /* OctagonTrust.m */,
+                               0CD743A923C3EC8000FA0EC5 /* Info.plist */,
+                               0CCC22CB23F3958B00E1FCD0 /* categories */,
+                               0CCC227B23F3586F00E1FCD0 /* ot-tests */,
+                       );
+                       path = OctagonTrust;
+                       sourceTree = "<group>";
+               };
+               0CE15E29222DF5FF00B7EAA4 /* RecoveryKey */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CE15E2B222DF63600B7EAA4 /* RecoverKeySet.swift */,
+                               0CE15E2A222DF63500B7EAA4 /* RecoveryKey.swift */,
+                       );
+                       name = RecoveryKey;
+                       sourceTree = "<group>";
+               };
+               0CF0E2DD1F8EE37C00BD18E4 /* SigninMetrics */ = {

                        isa = PBXGroup;
                        children = (
                                0CF405FB2072E351003D6A7F /* Resources */,
                        isa = PBXGroup;
                        children = (
                                0CF405FB2072E351003D6A7F /* Resources */,

-                               0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */,
-                               0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */,
-                               0C108C4B208A677100E8CF70 /* SFSignInAnalytics+Internal.h */,
+                               0CD9E33E235928D1002995DE /* OctagonSignPosts.h */,
+                               0CD9E340235928E9002995DE /* OctagonSignPosts.m */,

                                0CF405F32072E295003D6A7F /* tests */,
                        );
                                0CF405F32072E295003D6A7F /* tests */,
                        );

-                       path = "Signin Metrics";
+                       path = SigninMetrics;

                        sourceTree = "<group>";
                };
                0CF405F32072E295003D6A7F /* tests */ = {
                        isa = PBXGroup;
                        children = (
                        sourceTree = "<group>";
                };
                0CF405F32072E295003D6A7F /* tests */ = {
                        isa = PBXGroup;
                        children = (

-                               0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */,

                        );
                        path = tests;
                        sourceTree = "<group>";
                        );
                        path = tests;
                        sourceTree = "<group>";


@@ -15437,6 +18535,7 @@
                0CF405FB2072E351003D6A7F /* Resources */ = {
                        isa = PBXGroup;
                        children = (
                0CF405FB2072E351003D6A7F /* Resources */ = {
                        isa = PBXGroup;
                        children = (

+                               0C97867C235A76E70040A867 /* com.apple.security.signposts.plist */,

                                0CF405FC2072E352003D6A7F /* SFTMTests-Info.plist */,
                        );
                        path = Resources;
                                0CF405FC2072E352003D6A7F /* SFTMTests-Info.plist */,
                        );
                        path = Resources;


@@ -15448,6 +18547,7 @@
                                0C78F1C816A5E13400654E08 /* regressions */,
                                107226D00D91DB32003CF14F /* SecTask.c */,
                                4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */,
                                0C78F1C816A5E13400654E08 /* regressions */,
                                107226D00D91DB32003CF14F /* SecTask.c */,
                                4C7CE56E0DC7DB0A00AE53FC /* SecEntitlements.h */,

+                               6C54BE0C23F41497004716CB /* SystemEntitlements.h */,

                        );
                        name = sectask;
                        path = ../../../sectask;
                        );
                        name = sectask;
                        path = ../../../sectask;


@@ -15457,6 +18557,7 @@
                        isa = PBXGroup;
                        children = (
                                3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */,
                        isa = PBXGroup;
                        children = (
                                3DD1FE7E201AA50F0086D049 /* SecureTransportTests.m */,

+                               3DD2589820478CCE00F5DA78 /* STLegacyTests+session.m */,

                                3DD1FE7A201AA50D0086D049 /* STLegacyTests-Entitlements.plist */,
                                3DD1FE8A201AA5140086D049 /* STLegacyTests.h */,
                                3DD1FE8C201AA5150086D049 /* STLegacyTests.m */,
                                3DD1FE7A201AA50D0086D049 /* STLegacyTests-Entitlements.plist */,
                                3DD1FE8A201AA5140086D049 /* STLegacyTests.h */,
                                3DD1FE8C201AA5150086D049 /* STLegacyTests.m */,


@@ -15481,6 +18582,22 @@
                        path = SecureTransportTests;
                        sourceTree = "<group>";
                };
                        path = SecureTransportTests;
                        sourceTree = "<group>";
                };

+               3E4D4DFF2531174400B124B3 /* secsecstaticcodeapitest */ = {
+                       isa = PBXGroup;
+                       children = (
+                               3E4D508E253117DD00B124B3 /* secsecstaticcodeapitest.c */,
+                       );
+                       name = secsecstaticcodeapitest;
+                       sourceTree = "<group>";
+               };
+               3E88361224F0693200E9F4D6 /* secseccodeapitest */ = {
+                       isa = PBXGroup;
+                       children = (
+                               3E88361324F0699F00E9F4D6 /* secseccodeapitest.c */,
+                       );
+                       name = secseccodeapitest;
+                       sourceTree = "<group>";
+               };

                4381690E1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXGroup;
                        children = (
                4381690E1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXGroup;
                        children = (


@@ -15532,6 +18649,8 @@
                                6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */,
                                6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */,
                                0CD8D654207D6E65005CDBE8 /* SFAnalytics+Signin.h */,
                                6C69518E1F75A7DC00F68F91 /* SFAnalyticsSQLiteStore.h */,
                                6C69518D1F75A7DB00F68F91 /* SFAnalyticsSQLiteStore.m */,
                                0CD8D654207D6E65005CDBE8 /* SFAnalytics+Signin.h */,

+                               5A061190229ED60C006AF14A /* NSDate+SFAnalytics.h */,
+                               5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */,

                        );
                        path = Analytics;
                        sourceTree = "<group>";
                        );
                        path = Analytics;
                        sourceTree = "<group>";


@@ -15552,6 +18671,7 @@
                4727FBB81F9918590003AE36 /* secdxctests */ = {
                        isa = PBXGroup;
                        children = (
                4727FBB81F9918590003AE36 /* secdxctests */ = {
                        isa = PBXGroup;
                        children = (

+                               6CD8412B23F5D871003DDF34 /* KeychainBackupTests.m */,

                                477A1FEB2037A0E000ACD81D /* KeychainXCTest.h */,
                                477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */,
                                4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */,
                                477A1FEB2037A0E000ACD81D /* KeychainXCTest.h */,
                                477A1FEC2037A0E000ACD81D /* KeychainXCTest.m */,
                                4727FBB91F9918590003AE36 /* KeychainCryptoTests.m */,


@@ -15559,7 +18679,9 @@
                                47B503C5203B97A000722164 /* SFCredentialStoreTests.m */,
                                477A1FE1203763A500ACD81D /* KeychainAPITests.m */,
                                09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */,
                                47B503C5203B97A000722164 /* SFCredentialStoreTests.m */,
                                477A1FE1203763A500ACD81D /* KeychainAPITests.m */,
                                09BFE35A20A32E0E008511E9 /* KeychainEntitlementsTest.m */,

+                               6C84E3C723ECBC84003C9710 /* KeychainAppClipTests.m */,

                                4727FBBB1F9918590003AE36 /* Info.plist */,
                                4727FBBB1F9918590003AE36 /* Info.plist */,

+                               6C5D62A5221B6E3F00AF79DC /* secdxctests-entitlements.plist */,

                        );
                        path = secdxctests;
                        sourceTree = "<group>";
                        );
                        path = secdxctests;
                        sourceTree = "<group>";


@@ -15592,6 +18714,16 @@
                        path = KeychainDataclassOwner;
                        sourceTree = "<group>";
                };
                        path = KeychainDataclassOwner;
                        sourceTree = "<group>";
                };

+               47B3A90B21027D71001F4281 /* Trieste */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D19D2124780F0025B833 /* OctagonTestHarness */,
+                               E060D1BD212478120025B833 /* OctagonTestHarnessXPCService */,
+                               E060D23E21247C680025B833 /* OctagonTestHarnessXPCServiceProtocol */,
+                       );
+                       path = Trieste;
+                       sourceTree = "<group>";
+               };

                47C2F1852059CB680062DE30 /* KeychainResources */ = {
                        isa = PBXGroup;
                        children = (
                47C2F1852059CB680062DE30 /* KeychainResources */ = {
                        isa = PBXGroup;
                        children = (


@@ -15603,8 +18735,10 @@
                47C51B851EEA657D0032D9E5 /* SecurityUnitTests */ = {
                        isa = PBXGroup;
                        children = (
                47C51B851EEA657D0032D9E5 /* SecurityUnitTests */ = {
                        isa = PBXGroup;
                        children = (

-                               47C51B861EEA657D0032D9E5 /* SecurityUnitTests.m */,
+                               47C51B861EEA657D0032D9E5 /* SecKeyTests.m */,
+                               EB6D1D5322FE8D3000205E83 /* SecItemTests.m */,

                                47C51B881EEA657D0032D9E5 /* Info.plist */,
                                47C51B881EEA657D0032D9E5 /* Info.plist */,

+                               EB9795B422FE90E6002BDBFB /* SecurityUnitTests.entitlements */,

                        );
                        path = SecurityUnitTests;
                        sourceTree = "<group>";
                        );
                        path = SecurityUnitTests;
                        sourceTree = "<group>";


@@ -15612,18 +18746,12 @@
                47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */ = {
                        isa = PBXGroup;
                        children = (
                47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */ = {
                        isa = PBXGroup;
                        children = (

+                               DCE0777C21ADE96C002662FD /* generated */,

                                47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */,
                                47922D4E1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto */,

-                               47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */,
-                               47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */,
-                               47922D171FAA65120008F7E0 /* SecDbKeychainAKSSerializedWrappedKey.proto */,
-                               47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */,
-                               47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */,
+                               47922D171FAA65120008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.proto */,

                                47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */,
                                47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */,

-                               47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */,
-                               47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */,

                                47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */,
                                47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */,

-                               47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */,
-                               47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */,
+                               6C6AF178221A03930091CE0A /* SecDbKeychainSerializedMetadataKey.proto */,

                        );
                        path = "SecDbKeychainV7-protobufs";
                        sourceTree = "<group>";
                        );
                        path = "SecDbKeychainV7-protobufs";
                        sourceTree = "<group>";


@@ -15632,10 +18760,12 @@
                        isa = PBXGroup;
                        children = (
                                DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */,
                        isa = PBXGroup;
                        children = (
                                DCE4E80D1D7A4E3A00AFB96E /* com.apple.securityd.plist */,

+                               DCDACB5724A3F1AA0054080C /* com.apple.security.ckks.plist */,
+                               EB3FB9B7231C12A800DF52EA /* com.apple.security.trustedpeers.plist */,

                                48284A041D1DB06E00C76CB7 /* README_os_log_prefs.txt */,
                        );
                        name = os_log;
                                48284A041D1DB06E00C76CB7 /* README_os_log_prefs.txt */,
                        );
                        name = os_log;

-                       path = ../../..;
+                       path = ../../OSX/sec/os_log;

                        sourceTree = "<group>";
                };
                4C198F1A0ACDB4BF00AAB142 /* strings */ = {
                        sourceTree = "<group>";
                };
                4C198F1A0ACDB4BF00AAB142 /* strings */ = {


@@ -15656,6 +18786,8 @@
                4C35DB67094F906D002917C4 = {
                        isa = PBXGroup;
                        children = (
                4C35DB67094F906D002917C4 = {
                        isa = PBXGroup;
                        children = (

+                               3DC5BD58241830D50039ABF4 /* SecureTransportTests_macos.xctestplan */,
+                               3DC5BD59241845100039ABF4 /* SecureTransportTests_ios.xctestplan */,

                                DC6D2C941DD3B20400BE372D /* keychain */,
                                DC5AC2021D83668700CF422C /* Security.framework */,
                                DC5AC1FD1D83647300CF422C /* SecureObjectSync */,
                                DC6D2C941DD3B20400BE372D /* keychain */,
                                DC5AC2021D83668700CF422C /* Security.framework */,
                                DC5AC1FD1D83647300CF422C /* SecureObjectSync */,


@@ -15664,17 +18796,18 @@
                                DC5AC1FF1D83650C00CF422C /* securityd */,
                                6C69517B1F758E1000F68F91 /* supd */,
                                DC0BC4E51D8B6AA600070CB0 /* applications */,
                                DC5AC1FF1D83650C00CF422C /* securityd */,
                                6C69517B1F758E1000F68F91 /* supd */,
                                DC0BC4E51D8B6AA600070CB0 /* applications */,

-                               EB81D0CB1FE5838B00FD7F16 /* MultiDeviceSimulator */,

                                DC5AC2011D83663C00CF422C /* tests */,
                                EB2CA5311D2C30CD00AB770F /* xcconfig */,
                                EBC73F44209A0BB200AE3350 /* xcscripts */,
                                EBF374731DC055590065D840 /* security-sysdiagnose */,
                                DC5AC2011D83663C00CF422C /* tests */,
                                EB2CA5311D2C30CD00AB770F /* xcconfig */,
                                EBC73F44209A0BB200AE3350 /* xcscripts */,
                                EBF374731DC055590065D840 /* security-sysdiagnose */,

+                               DC7FC44121EE6F4E003C39B8 /* featureflags */,

                                E7FCBE401314471B000DE34E /* Frameworks */,
                                4C8BC620097DBC1B00C781D5 /* Libraries */,
                                4C35DC36094F9120002917C4 /* Products */,
                                4C4CE9120AF81F0E0056B01D /* README */,
                                4CAB97FD1114CC5300EFB38D /* README.keychain */,
                                4C4CE9070AF81ED80056B01D /* TODO */,
                                E7FCBE401314471B000DE34E /* Frameworks */,
                                4C8BC620097DBC1B00C781D5 /* Libraries */,
                                4C35DC36094F9120002917C4 /* Products */,
                                4C4CE9120AF81F0E0056B01D /* README */,
                                4CAB97FD1114CC5300EFB38D /* README.keychain */,
                                4C4CE9070AF81ED80056B01D /* TODO */,

+                               EBAC4A512189743D00FBEC43 /* rio.yml */,

                        );
                        sourceTree = "<group>";
                };
                        );
                        sourceTree = "<group>";
                };


@@ -15726,8 +18859,6 @@
                                DCC78EA91D8088E200865A7C /* libsecurity.a */,
                                DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */,
                                DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */,
                                DCC78EA91D8088E200865A7C /* libsecurity.a */,
                                DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */,
                                DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */,

-                               DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */,
-                               DC52EBD51D80CEF100B0A59C /* libSecurityCommands.a */,

                                DC52EC341D80CFB200B0A59C /* libSOSCommands.a */,
                                DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */,
                                DC52EC5C1D80D05200B0A59C /* liblogging.a */,
                                DC52EC341D80CFB200B0A59C /* libSOSCommands.a */,
                                DC52EC4D1D80D00800B0A59C /* libSWCAgent.a */,
                                DC52EC5C1D80D05200B0A59C /* liblogging.a */,


@@ -15751,7 +18882,7 @@
                                DCF7884E1D88CA7200E694BB /* libsecurity_apple_x509_cl.a */,
                                DCF7889D1D88CB5200E694BB /* apple_x509_cl.bundle */,
                                DCF788D61D88CD2400E694BB /* libsecurity_apple_x509_tp.a */,
                                DCF7884E1D88CA7200E694BB /* libsecurity_apple_x509_cl.a */,
                                DCF7889D1D88CB5200E694BB /* apple_x509_cl.bundle */,
                                DCF788D61D88CD2400E694BB /* libsecurity_apple_x509_tp.a */,

-                               DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */,
+                               DC8834081D8A218F00CE0ACA /* libASN1.a */,

                                DCB3406D1D8A24DF0054D16E /* libsecurity_authorization.a */,
                                DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */,
                                DCB341371D8A2A010054D16E /* libsecurity_cdsa_plugin.a */,
                                DCB3406D1D8A24DF0054D16E /* libsecurity_authorization.a */,
                                DCB340951D8A267C0054D16E /* libsecurity_cdsa_client.a */,
                                DCB341371D8A2A010054D16E /* libsecurity_cdsa_plugin.a */,


@@ -15786,19 +18917,16 @@
                                DCD06A741D8CE2D5007602F1 /* gkunpack */,
                                DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */,
                                DC3A4B581D91E9FB00E46D4A /* com.apple.CodeSigningHelper.xpc */,
                                DCD06A741D8CE2D5007602F1 /* gkunpack */,
                                DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */,
                                DC3A4B581D91E9FB00E46D4A /* com.apple.CodeSigningHelper.xpc */,

-                               DC71D9DF1D95BA6C0065FB93 /* libASN1.a */,

                                EBF374721DC055580065D840 /* security-sysdiagnose */,
                                DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */,
                                DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */,
                                EB1055751E14DF430003C309 /* libSecCertificateFuzzer.dylib */,
                                DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */,
                                EBF374721DC055580065D840 /* security-sysdiagnose */,
                                DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */,
                                DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.a */,
                                EB1055751E14DF430003C309 /* libSecCertificateFuzzer.dylib */,
                                DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */,

-                               DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */,

                                EBB839A51E29665D00853BAC /* secfuzzer */,
                                225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */,
                                D4ADA3191E2B41670031CEA3 /* libtrustd.a */,
                                6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */,
                                EBB839A51E29665D00853BAC /* secfuzzer */,
                                225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */,
                                D4ADA3191E2B41670031CEA3 /* libtrustd.a */,
                                6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */,

-                               6CF4A0E01E4549F200ECD7B5 /* KeychainEntitledTestApp.app */,

                                EB27FF111E402CD300EC9E3A /* ckksctl */,
                                470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1E1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
                                EB27FF111E402CD300EC9E3A /* ckksctl */,
                                470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1E1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,


@@ -15806,8 +18934,6 @@
                                EB108F411E6CE4D2003B0456 /* KCPairingTests.xctest */,
                                F667EC601E96E9B100203D5C /* authdtest */,
                                D41257CF1E9410A300781F23 /* trustd */,
                                EB108F411E6CE4D2003B0456 /* KCPairingTests.xctest */,
                                F667EC601E96E9B100203D5C /* authdtest */,
                                D41257CF1E9410A300781F23 /* trustd */,

-                               6C9808611E788AEB00E70590 /* CKKSCloudKitTests.xctest */,
-                               6C98089D1E788AFD00E70590 /* CKKSCloudKitTests.xctest */,

                                ACBAF6DD1E9417F40007BA2F /* libsecurity_transform_regressions.a */,
                                BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */,
                                BEF88C301EAFFC3F00357577 /* TrustedPeersTests.xctest */,
                                ACBAF6DD1E9417F40007BA2F /* libsecurity_transform_regressions.a */,
                                BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */,
                                BEF88C301EAFFC3F00357577 /* TrustedPeersTests.xctest */,


@@ -15815,25 +18941,56 @@
                                BED208DD1EDF950E00753952 /* manifeststresstest */,
                                47C51B841EEA657D0032D9E5 /* SecurityUnitTests.xctest */,
                                EB2D54AA1F02A45E00E46890 /* secatomicfile */,
                                BED208DD1EDF950E00753952 /* manifeststresstest */,
                                47C51B841EEA657D0032D9E5 /* SecurityUnitTests.xctest */,
                                EB2D54AA1F02A45E00E46890 /* secatomicfile */,

-                               4727FBB71F9918580003AE36 /* secdxctests_ios.xctest */,
+                               4727FBB71F9918580003AE36 /* secdxctests.xctest */,

                                0C85E0031FB38BB6000343A7 /* OTTests.xctest */,
                                6C9AA79E1F7C1D8F00D08296 /* supdctl */,
                                6CAA8D201F842FB3007B6E03 /* securityuploadd */,
                                6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */,
                                0C8BBF081FCB446400580909 /* otctl */,
                                0C85E0031FB38BB6000343A7 /* OTTests.xctest */,
                                6C9AA79E1F7C1D8F00D08296 /* supdctl */,
                                6CAA8D201F842FB3007B6E03 /* securityuploadd */,
                                6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */,
                                0C8BBF081FCB446400580909 /* otctl */,

-                               EB056E3E1FE5E390000A771E /* DeviceSimulator.xpc */,
-                               EB05C4F11FE5E48A00D68712 /* MultiDeviceSimulatorTests.xctest */,
-                               478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */,
-                               EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */,

                                3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */,
                                3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */,
                                3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */,
                                3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */,

+                               BEAA002B202A832500E51F45 /* TrustedPeersHelper.xpc */,
+                               EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */,

                                47C2F1832059CB680062DE30 /* KeychainResources.bundle */,
                                4718AE2D205B39620068EC3F /* securityd */,
                                4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */,
                                47C2F1832059CB680062DE30 /* KeychainResources.bundle */,
                                4718AE2D205B39620068EC3F /* securityd */,
                                4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */,

-                               0CF406502072E3E3003D6A7F /* SignInAnalyticsTests_ios.xctest */,
-                               0C9AEEB720783FBB00BF6237 /* SignInAnalyticsTests_osx.xctest */,

                                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */,
                                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */,

+                               DC0EF8EF208697C600AB9E95 /* tpctl */,
+                               BED987D32099145300607A5F /* TrustedPeersHelperUnitTests.xctest */,

                                4771D972209A755800BA9772 /* KeychainDataclassOwner.bundle */,
                                4771D972209A755800BA9772 /* KeychainDataclassOwner.bundle */,

+                               DC99B89220EACA470065B73B /* OctagonTests.xctest */,
+                               BECFA42E20F91AFE00B11002 /* tppolicy */,
+                               D44D1F662115893000E76E1A /* libCMS.a */,
+                               D42C839821159146008D3D83 /* libsecurity_cms.a */,
+                               D4D1FDDC21165F8B003538E2 /* libsecurity_cms_regressions.a */,
+                               D4707A0521136E69005BCFDA /* TrustTests.xctest */,
+                               D453A4C02122236D00850A26 /* TrustTests.xctest */,
+                               DC05037621409A4000A8EDB7 /* OCMockUmbrella.framework */,
+                               E060D19C2124780E0025B833 /* OctagonTestHarness.framework */,
+                               E060D1A72124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol.framework */,
+                               E060D1B7212478110025B833 /* OctagonTestHarnessXPCService.xpc */,
+                               D458C4E1214E1DE00043D982 /* TrustTestsRunner_ios.app */,
+                               D458C506214E20530043D982 /* TrustTests */,
+                               DC36895E21235F42003A3735 /* libaks_mock.a */,
+                               DC311E772124B8A8002F5EAE /* libaks_real_witness.a */,
+                               DCF216D721ADD5B10029CCC1 /* libprotobuf_source_generation.a */,
+                               3D58394D21890FFB000ACA44 /* SecExperimentTests.xctest */,
+                               DC7FC44821EE914C003C39B8 /* FeatureFlagsPlist.bundle */,
+                               EB89088621F17D3C00F0DDDB /* recovery_securityd */,
+                               DCBF4AE021FFC82100539F0A /* SecEscrowRequestTests.xctest */,
+                               EB74CC162207E48000F1BBAD /* KeychainSettings.bundle */,
+                               6C39237921F13E4D00D018AD /* SecDbBackupTests.xctest */,
+                               EB6952B9223B75C300F02C1C /* secitemd */,
+                               DA41FE0E2241ADC000838FB3 /* otpaird */,
+                               EBB851EC22F7912400424FD0 /* SecurityUtilitiesTests.xctest */,
+                               5A442F90233C330F00918373 /* experimentTool */,
+                               0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */,
+                               6C7BE2E723C3DD64003BB2CA /* securitytool_bridge */,
+                               0CCC227923F357EE00E1FCD0 /* OctagonTrustTests.xctest */,
+                               6C2045EA2424BA7E00F9461D /* KeychainStasher */,
+                               6C963281242A279B00C53CE2 /* stashtester */,
+                               3E88361124F068EF00E9F4D6 /* secseccodeapitest */,
+                               3E4D49BC2531170600B124B3 /* secsecstaticcodeapitest */,

                        );
                        name = Products;
                        sourceTree = "<group>";
                        );
                        name = Products;
                        sourceTree = "<group>";


@@ -15918,14 +19075,33 @@
                4C922CB2097F1984004CEEBD /* Security */ = {
                        isa = PBXGroup;
                        children = (
                4C922CB2097F1984004CEEBD /* Security */ = {
                        isa = PBXGroup;
                        children = (

+                               1BE85ECD235CEB610051E1D8 /* cms-tapi.h */,
+                               5F00F95A230614A200B832E0 /* SecImportExportPriv.h */,

                                D44D08B420AB890E0023C439 /* Security.apinotes */,
                                D44D08B420AB890E0023C439 /* Security.apinotes */,

+                               D4707A1021137525005BCFDA /* CMSDecoder.h */,
+                               D47079F9211355B3005BCFDA /* CMSEncoder.h */,
+                               D4707A0D211373D4005BCFDA /* CMSPrivate.h */,

                                DC1785981D778C5300B50D50 /* cssmapple.h */,
                                4C28BCD60986EBCB0020C665 /* certextensions.h */,
                                DC1785981D778C5300B50D50 /* cssmapple.h */,
                                4C28BCD60986EBCB0020C665 /* certextensions.h */,

+                               443381D918A3D81400215606 /* SecAccessControl.h */,

                                4C696B3709BFA94F000CBC75 /* SecBase.h */,
                                4C0208F80D3C154200BFE54E /* SecBasePriv.h */,
                                4C8FD03D099D5C91006867B6 /* SecCertificate.h */,
                                4C7608B10AC34A8100980096 /* SecCertificatePriv.h */,
                                791766DD0DD0162C00F3B974 /* SecCertificateRequest.h */,
                                4C696B3709BFA94F000CBC75 /* SecBase.h */,
                                4C0208F80D3C154200BFE54E /* SecBasePriv.h */,
                                4C8FD03D099D5C91006867B6 /* SecCertificate.h */,
                                4C7608B10AC34A8100980096 /* SecCertificatePriv.h */,
                                791766DD0DD0162C00F3B974 /* SecCertificateRequest.h */,

+                               D47079F221128C46005BCFDA /* SecCMS.h */,
+                               D4707A1F2113AB65005BCFDA /* SecCmsBase.h */,
+                               D4707A2B2114B31A005BCFDA /* SecCmsContentInfo.h */,
+                               D4707A252113E9B6005BCFDA /* SecCmsDecoder.h */,
+                               D4707A2E2114C30A005BCFDA /* SecCmsDigestContext.h */,
+                               D4B3B1CB2115149C00A43409 /* SecCmsDigestedData.h */,
+                               D4707A222113B48E005BCFDA /* SecCmsEncoder.h */,
+                               D4B3B1CE2115167600A43409 /* SecCmsEncryptedData.h */,
+                               D4B3B1D1211517B000A43409 /* SecCmsEnvelopedData.h */,
+                               D4707A282113ECA0005BCFDA /* SecCmsMessage.h */,
+                               D4B3B1D42115193600A43409 /* SecCmsRecipientInfo.h */,
+                               D4B3B1D721151B9900A43409 /* SecCmsSignedData.h */,
+                               D4B3B1DA2115293300A43409 /* SecCmsSignerInfo.h */,

                                4CAC87D60B8F82720009C9FC /* SecIdentity.h */,
                                4CCE0AD90D41797400DDBB21 /* SecIdentityPriv.h */,
                                79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */,
                                4CAC87D60B8F82720009C9FC /* SecIdentity.h */,
                                4CCE0AD90D41797400DDBB21 /* SecIdentityPriv.h */,
                                79EF5B6C0D3D6A31009F5270 /* SecImportExport.h */,


@@ -15937,13 +19113,17 @@
                                09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */,
                                4CBA0E860BB33C0000E72B55 /* SecPolicy.h */,
                                4C6416D40BB34F00001C83FD /* SecPolicyPriv.h */,
                                09A3B9D71F8267BB00C5C324 /* SecKeyProxy.h */,
                                4CBA0E860BB33C0000E72B55 /* SecPolicy.h */,
                                4C6416D40BB34F00001C83FD /* SecPolicyPriv.h */,

-                               5AFCF32D20746D9A0010D4B5 /* SecProtocolObject.h */,
-                               5AFCF32220746AD80010D4B5 /* SecProtocolOptions.h */,
-                               5A4E381A207529480047F40F /* SecProtocol.h */,
-                               5AC6BFA52077CD130051737D /* SecProtocolTypes.h */,
-                               5AFCF32820746AE90010D4B5 /* SecProtocolMetadata.h */,
-                               AA44E0D920325177001EA371 /* SecProtocolPriv.h */,
+                               5A6D1B8D20810EA30057CAC8 /* SecProtocolMetadata.h */,
+                               5AE4BEEE1FA79456001B9DA4 /* SecProtocolObject.h */,
+                               5A6D1B9320810EA30057CAC8 /* SecProtocolOptions.h */,
+                               AA9FD5982152AFC00045A07A /* SecProtocolConfiguration.h */,
+                               5AF594011FA1051500A5C1EC /* SecProtocolPriv.h */,
+                               AADD4A28215E82440054FC6D /* SecProtocolInternal.h */,
+                               5A6D1B9420810EA40057CAC8 /* SecProtocolTypes.h */,
+                               AAE91C542162634200B6BF0B /* SecProtocolTypesPriv.h */,

                                4C2F81D40BF121D2003C4F77 /* SecRandom.h */,
                                4C2F81D40BF121D2003C4F77 /* SecRandom.h */,

+                               BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */,
+                               D43718C721168D7C00EA350A /* SecSMIME.h */,

                                107226D10D91DB32003CF14F /* SecTask.h */,
                                DCD068031D8CDF7E007602F1 /* SecTaskPriv.h */,
                                4C8FD03E099D5C91006867B6 /* SecTrust.h */,
                                107226D10D91DB32003CF14F /* SecTask.h */,
                                DCD068031D8CDF7E007602F1 /* SecTaskPriv.h */,
                                4C8FD03E099D5C91006867B6 /* SecTrust.h */,


@@ -15969,21 +19149,6 @@
                        path = ../../../ntlm;
                        sourceTree = "<group>";
                };
                        path = ../../../ntlm;
                        sourceTree = "<group>";
                };

-               4CB740FA0A47580400D641BB /* Security2Tool macOS */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCE4E6A71D7A38C000AFB96E /* security2.1 */,
-                               DC52EA901D80CC2A00B0A59C /* entitlements.plist */,
-                               E78A9AD81D34959200006B5B /* NSFileHandle+Formatting.h */,
-                               E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */,
-                               E7104A0B169E171900DB0045 /* security_tool_commands.c */,
-                               D453C47F1FFD857400DE349B /* security_tool_commands.h */,
-                               E7FEFB80169E26E200E18152 /* sub_commands.h */,
-                       );
-                       name = "Security2Tool macOS";
-                       path = SecurityTool;
-                       sourceTree = "<group>";
-               };

                4CE5A55609C7970A00D27A3F /* sslViewer */ = {
                        isa = PBXGroup;
                        children = (
                4CE5A55609C7970A00D27A3F /* sslViewer */ = {
                        isa = PBXGroup;
                        children = (


@@ -16026,6 +19191,65 @@
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };

+               5A04BB1F2298728A001848A0 /* test */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5A04BB22229872CB001848A0 /* SecXPCHelperTests.m */,
+                               EB6AC0AA22F22E80003F067B /* SecTapToRadarTests.m */,
+                               EBB8521A22F7943700424FD0 /* Info.plist */,
+                       );
+                       path = test;
+                       sourceTree = "<group>";
+               };
+               5A442F97233C34C000918373 /* experiment */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5A442F98233C34C000918373 /* SecExperimentPriv.h */,
+                               5A442F9B233C34C000918373 /* SecExperimentInternal.h */,
+                               5A442F9C233C34C000918373 /* SecExperiment.m */,
+                               5A442F99233C34C000918373 /* test */,
+                               5A442F9D233C34C000918373 /* tool */,
+                       );
+                       path = experiment;
+                       sourceTree = "<group>";
+               };
+               5A442F99233C34C000918373 /* test */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5A442F9A233C34C000918373 /* SecExperimentTests.m */,
+                       );
+                       path = test;
+                       sourceTree = "<group>";
+               };
+               5A442F9D233C34C000918373 /* tool */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5A442F9E233C34C000918373 /* experimentTool-Entitlements.plist */,
+                               5A442F9F233C34C000918373 /* experimentTool.m */,
+                       );
+                       path = tool;
+                       sourceTree = "<group>";
+               };
+               5A47FFAF228F5DAB00F781B8 /* Protocol Buffers */ = {
+                       isa = PBXGroup;
+                       children = (
+                               5A47FFB1228F5DF700F781B8 /* KCInitialMessageData.proto */,
+                       );
+                       name = "Protocol Buffers";
+                       sourceTree = "<group>";
+               };
+               5AF593FD1FA0EE2C00A5C1EC /* Protocol */ = {
+                       isa = PBXGroup;
+                       children = (
+                               AA44E0AD202E3422001EA371 /* test */,
+                               5AF593FE1FA0EE5300A5C1EC /* SecProtocol.c */,
+                               5A7E037722272C2D003DB3A0 /* SecProtocolHelper.m */,
+                               AA9FD59B2152AFD70045A07A /* SecProtocolConfiguration.m */,
+                               78ADC6251FA0FAC5001EB8B6 /* SecProtocolTypes.m */,
+                       );
+                       name = Protocol;
+                       sourceTree = "<group>";
+               };

                5E10992719A5E55800A60E2B /* ISACLProtectedItems */ = {
                        isa = PBXGroup;
                        children = (
                5E10992719A5E55800A60E2B /* ISACLProtectedItems */ = {
                        isa = PBXGroup;
                        children = (


@@ -16057,15 +19281,46 @@
                        path = secacltests;
                        sourceTree = "<group>";
                };
                        path = secacltests;
                        sourceTree = "<group>";
                };

-               6C34464D1E2534C200F9522B /* Analytics */ = {
+               6C0535F422B7043B0064BA50 /* TestHostBinaries */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6CB5F4791E402E5700DBF3F0 /* KeychainEntitledTestRunner.entitlements */,
+                               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp */,
+                               6CB5F4771E402D6D00DBF3F0 /* KeychainEntitledTestRunner */,
+                       );
+                       name = TestHostBinaries;
+                       path = tests/TestHostBinaries;
+                       sourceTree = "<group>";
+               };
+               6C34464D1E2534C200F9522B /* analytics */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

+                               EBB0314122223786007241CB /* Tests */,
+                               EB7E90F62193F93B00B1FA21 /* C2Metric */,

                                EBB407AF1EBA433A00A541A5 /* CKKSPowerCollection.h */,
                                EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */,
                                EBB407AF1EBA433A00A541A5 /* CKKSPowerCollection.h */,
                                EBB407B01EBA433A00A541A5 /* CKKSPowerCollection.m */,

-                               479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */,
-                               479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */,
+                               EBB02A6C2220ED16007241CB /* CKKSLaunchSequence.h */,
+                               EBB02A6D2220ED16007241CB /* CKKSLaunchSequence.m */,
+                               EB7E91112194826F00B1FA21 /* SecEventMetric.h */,
+                               EB7E91242194915600B1FA21 /* SecEventMetric_private.h */,
+                               EB7E91122194826F00B1FA21 /* SecEventMetric.m */,
+                               EB7E90EB2193A54100B1FA21 /* SecMetrics.h */,
+                               EB7E90EC2193A54100B1FA21 /* SecMetrics.m */,
+                               EB7E910F2193FB7E00B1FA21 /* SecC2DeviceInfo.h */,
+                               EB7E91102193FB7E00B1FA21 /* SecC2DeviceInfo.m */,
+                               EB7E90EF2193A56C00B1FA21 /* C2Metric.proto */,
+                               EB093106213F8EC100C0A495 /* TestResourceUsage.h */,
+                               EB093107213F8EC100C0A495 /* TestResourceUsage.m */,
+                       );
+                       path = analytics;
+                       sourceTree = "<group>";
+               };
+               6C534E0422C3E52600D4781F /* Discovery Plists */ = {
+                       isa = PBXGroup;
+                       children = (

                        );
                        );

-                       name = Analytics;
+                       name = "Discovery Plists";
+                       path = "tests/Discovery Plists";

                        sourceTree = "<group>";
                };
                6C69517B1F758E1000F68F91 /* supd */ = {
                        sourceTree = "<group>";
                };
                6C69517B1F758E1000F68F91 /* supd */ = {


@@ -16081,6 +19336,7 @@
                                6C1260F21F7D5F25001B2EEC /* securityuploadd-osx.plist */,
                                6C5B10211F9164F5009B091E /* securityuploadd.8 */,
                                6CDB600E1FA92C1700410924 /* securityuploadd-Entitlements.plist */,
                                6C1260F21F7D5F25001B2EEC /* securityuploadd-osx.plist */,
                                6C5B10211F9164F5009B091E /* securityuploadd.8 */,
                                6CDB600E1FA92C1700410924 /* securityuploadd-Entitlements.plist */,

+                               D42D044124733BEA004E7AA2 /* com.apple.securityuploadd.sb */,

                        );
                        path = supd;
                        sourceTree = "<group>";
                        );
                        path = supd;
                        sourceTree = "<group>";


@@ -16088,6 +19344,7 @@
                6C758CAF1F8826100075BD78 /* Tests */ = {
                        isa = PBXGroup;
                        children = (
                6C758CAF1F8826100075BD78 /* Tests */ = {
                        isa = PBXGroup;
                        children = (

+                               5A1A1C2122A71D2A00CB8D1D /* NSDate+SFAnalyticsTests.m */,

                                6C1A29FC1F882788002312D8 /* SFAnalyticsTests.m */,
                                6C758CB01F8826100075BD78 /* SupdTests.m */,
                                6C758CB21F8826100075BD78 /* Info.plist */,
                                6C1A29FC1F882788002312D8 /* SFAnalyticsTests.m */,
                                6C758CB01F8826100075BD78 /* SupdTests.m */,
                                6C758CB21F8826100075BD78 /* Info.plist */,


@@ -16106,6 +19363,61 @@
                        path = Clients;
                        sourceTree = "<group>";
                };
                        path = Clients;
                        sourceTree = "<group>";
                };

+               6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C6579FC2394878700701C8B /* SecDbBackupTestsBase.m */,
+                               6CD224E7239493E8001B70FD /* SecDbBackupTestsBase.h */,
+                               6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */,
+                               6C02134F21F7ED45009D5C80 /* Info.plist */,
+                               6C2008EF220BB4B500674B3A /* SecDbBackupTests-Entitlements.plist */,
+                       );
+                       name = SecDbBackupTests;
+                       path = tests/SecDbBackupTests;
+                       sourceTree = "<group>";
+               };
+               6C880FBD21C334CE00D38D66 /* generated_source */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C880FC421C334FD00D38D66 /* SecDbBackupBag.h */,
+                               6C880FC321C334FD00D38D66 /* SecDbBackupBag.m */,
+                               6C880FBE21C334FB00D38D66 /* SecDbBackupBagIdentity.h */,
+                               6C880FC621C334FE00D38D66 /* SecDbBackupBagIdentity.m */,
+                               6C880FBF21C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.h */,
+                               6C880FC221C334FC00D38D66 /* SecDbBackupKeyClassSigningKey.m */,
+                               6C880FC521C334FD00D38D66 /* SecDbBackupMetadataClassKey.h */,
+                               6C880FC121C334FC00D38D66 /* SecDbBackupMetadataClassKey.m */,
+                               6C880FC721C334FE00D38D66 /* SecDbBackupRecoverySet.h */,
+                               6C880FC021C334FC00D38D66 /* SecDbBackupRecoverySet.m */,
+                       );
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               6C963282242A279B00C53CE2 /* stashtester */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C963283242A279B00C53CE2 /* main.m */,
+                               6C963289242A27F300C53CE2 /* stashtester.entitlements */,
+                       );
+                       name = stashtester;
+                       path = tests/stashtester;
+                       sourceTree = "<group>";
+               };
+               6C997868242362EC008C498D /* KeychainStasher */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C997869242362EC008C498D /* KeychainStasherProtocol.h */,
+                               6C99786A242362EC008C498D /* KeychainStasher.h */,
+                               6C99786B242362EC008C498D /* KeychainStasher.m */,
+                               6C99786D242362EC008C498D /* main.m */,
+                               6C99786F242362EC008C498D /* KeychainStasher-Info.plist */,
+                               6C48D10D2423A2F3004AF950 /* KeychainStasher.entitlements */,
+                               6C48D10F2423A3C0004AF950 /* com.apple.security.KeychainStasher.sb */,
+                               6C2045F92424BCB800F9461D /* com.apple.security.KeychainStasher.plist */,
+                       );
+                       path = KeychainStasher;
+                       sourceTree = "<group>";
+               };

                6C9AA79F1F7C1D9000D08296 /* supdctl */ = {
                        isa = PBXGroup;
                        children = (
                6C9AA79F1F7C1D9000D08296 /* supdctl */ = {
                        isa = PBXGroup;
                        children = (


@@ -16115,16 +19427,24 @@
                        path = supdctl;
                        sourceTree = "<group>";
                };
                        path = supdctl;
                        sourceTree = "<group>";
                };

-               6CB5F4771E402D6D00DBF3F0 /* testrunner */ = {
+               6CB5F4771E402D6D00DBF3F0 /* KeychainEntitledTestRunner */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               6CB5F4791E402E5700DBF3F0 /* KeychainEntitledTestRunner-Entitlements.plist */,

                                6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */,
                        );
                                6CB5F47A1E402E5700DBF3F0 /* KeychainEntitledTestRunner.m */,
                        );

-                       path = testrunner;
+                       path = KeychainEntitledTestRunner;
+                       sourceTree = "<group>";
+               };
+               6CB6CBFE2198D40B0080AD6F /* SecDbBackupManager-protobufs */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C880FBD21C334CE00D38D66 /* generated_source */,
+                               6CB6CC022198D4BC0080AD6F /* SecDbBackupRecoverySet.proto */,
+                       );
+                       path = "SecDbBackupManager-protobufs";

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */ = {
+               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp */ = {

                        isa = PBXGroup;
                        children = (
                                6CF4A0B61E45488B00ECD7B5 /* AppDelegate.h */,
                        isa = PBXGroup;
                        children = (
                                6CF4A0B61E45488B00ECD7B5 /* AppDelegate.h */,


@@ -16132,12 +19452,10 @@
                                6CF4A0BC1E45488B00ECD7B5 /* ViewController.h */,
                                6CF4A0BD1E45488B00ECD7B5 /* ViewController.m */,
                                6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */,
                                6CF4A0BC1E45488B00ECD7B5 /* ViewController.h */,
                                6CF4A0BD1E45488B00ECD7B5 /* ViewController.m */,
                                6CF4A0BF1E45488B00ECD7B5 /* Assets.xcassets */,

-                               6CF4A0C11E45488B00ECD7B5 /* Main.storyboard */,

                                6CF4A0C41E45488B00ECD7B5 /* Info.plist */,
                                6CF4A0B91E45488B00ECD7B5 /* Supporting Files */,
                        );
                                6CF4A0C41E45488B00ECD7B5 /* Info.plist */,
                                6CF4A0B91E45488B00ECD7B5 /* Supporting Files */,
                        );

-                       name = KeychainEntitledTestApp_mac;
-                       path = ../../../KeychainEntitledTestApp_mac;
+                       path = KeychainEntitledTestApp;

                        sourceTree = "<group>";
                };
                6CF4A0B91E45488B00ECD7B5 /* Supporting Files */ = {
                        sourceTree = "<group>";
                };
                6CF4A0B91E45488B00ECD7B5 /* Supporting Files */ = {


@@ -16148,31 +19466,6 @@
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };

-               6CF4A0E11E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */ = {
-                       isa = PBXGroup;
-                       children = (
-                               6CF4A0E51E4549F200ECD7B5 /* AppDelegate.h */,
-                               6CF4A0E61E4549F300ECD7B5 /* AppDelegate.m */,
-                               6CF4A0E81E4549F300ECD7B5 /* ViewController.h */,
-                               6CF4A0E91E4549F300ECD7B5 /* ViewController.m */,
-                               6CF4A0EB1E4549F300ECD7B5 /* Main.storyboard */,
-                               6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */,
-                               6CF4A0F01E4549F300ECD7B5 /* LaunchScreen.storyboard */,
-                               6CF4A0F31E4549F300ECD7B5 /* Info.plist */,
-                               6CF4A0E21E4549F200ECD7B5 /* Supporting Files */,
-                       );
-                       name = KeychainEntitledTestApp_ios;
-                       path = ../../../KeychainEntitledTestApp_ios;
-                       sourceTree = "<group>";
-               };
-               6CF4A0E21E4549F200ECD7B5 /* Supporting Files */ = {
-                       isa = PBXGroup;
-                       children = (
-                               6CF4A0E31E4549F200ECD7B5 /* main.m */,
-                       );
-                       name = "Supporting Files";
-                       sourceTree = "<group>";
-               };

                7908507E0CA87CF00083CC4D /* ipc */ = {
                        isa = PBXGroup;
                        children = (
                7908507E0CA87CF00083CC4D /* ipc */ = {
                        isa = PBXGroup;
                        children = (


@@ -16184,7 +19477,7 @@
                                DC6ACC401E81DF9400125DC5 /* server_endpoint.m */,
                                DCB2214A1E8B0861001598BC /* server_xpc.m */,
                                6C1520CD1DCCF57A00C85C6D /* secd.8 */,
                                DC6ACC401E81DF9400125DC5 /* server_endpoint.m */,
                                DCB2214A1E8B0861001598BC /* server_xpc.m */,
                                6C1520CD1DCCF57A00C85C6D /* secd.8 */,

-                               DC4269061E82FBDF002B7110 /* server_security_helpers.c */,
+                               DC4269061E82FBDF002B7110 /* server_security_helpers.m */,

                                DC4269071E82FBDF002B7110 /* server_security_helpers.h */,
                                DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */,
                                DC5F35A51EE0F1A900900966 /* server_entitlement_helpers.h */,
                                DC4269071E82FBDF002B7110 /* server_security_helpers.h */,
                                DC5F35A41EE0F1A900900966 /* server_entitlement_helpers.c */,
                                DC5F35A51EE0F1A900900966 /* server_entitlement_helpers.h */,


@@ -16206,13 +19499,24 @@
                        path = DigicertMalaysia;
                        sourceTree = "<group>";
                };
                        path = DigicertMalaysia;
                        sourceTree = "<group>";
                };

-               AA44E0CF2032511C001EA371 /* Protocol */ = {
+               AA0DA47721E81885009F1C74 /* test_data */ = {
+                       isa = PBXGroup;
+                       children = (
+                               AA0DA47921E8189E009F1C74 /* builtins.json */,
+                               AA0DA47821E8189D009F1C74 /* example1.json */,
+                       );
+                       name = test_data;
+                       sourceTree = "<group>";
+               };
+               AA44E0AD202E3422001EA371 /* test */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               AA44E0D02032513F001EA371 /* SecProtocol.c */,
-                               AA44E0D120325140001EA371 /* SecProtocolTypes.m */,
+                               AA0DA47721E81885009F1C74 /* test_data */,
+                               AA44E0B3202E3451001EA371 /* SecProtocolTest.m */,
+                               5A43A07F225FA38D005450E4 /* SecProtocolHelperTest.m */,
+                               AADD4A2B215E83140054FC6D /* SecProtocolConfigurationTest.m */,

                        );
                        );

-                       path = Protocol;
+                       name = test;

                        sourceTree = "<group>";
                };
                ACBAF6DF1E941A800007BA2F /* regressions */ = {
                        sourceTree = "<group>";
                };
                ACBAF6DF1E941A800007BA2F /* regressions */ = {


@@ -16251,30 +19555,142 @@
                BE34059B1FD71BA700933DAC /* Protocol Buffers */ = {
                        isa = PBXGroup;
                        children = (
                BE34059B1FD71BA700933DAC /* Protocol Buffers */ = {
                        isa = PBXGroup;
                        children = (

-                               BE3405A11FD71CC800933DAC /* OTBottle.proto */,
-                               BE3405A51FD720C900933DAC /* OTBottleContents.proto */,
-                               BEB0B0CE1FFC37E3007E6A83 /* OTPrivateKey.proto */,
-                               BEE4B1861FFD57D800777D39 /* OTAuthenticatedCiphertext.proto */,
-                               BE3405A21FD71CDE00933DAC /* derived source */,
+                               0C0F76DD21399AF40074EDDF /* OTPairingMessage.proto */,
+                               DC751A0C211E02B100C18042 /* OTAccountMetadataClassC.proto */,
+                               BE3405A21FD71CDE00933DAC /* generated */,

                        );
                        name = "Protocol Buffers";
                        );
                        name = "Protocol Buffers";

-                       path = ot/proto;
+                       path = proto;

                        sourceTree = "<group>";
                };
                        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;
+               BE3405A21FD71CDE00933DAC /* generated */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0C3C47C524902D470084B951 /* OTGlobalEnums.h */,
+                               0C3C47C424902D470084B951 /* OTSupportOctagonMessage.h */,
+                               0C3C47C024902D450084B951 /* OTSupportOctagonMessage.m */,
+                               0C3C47C224902D460084B951 /* OTSupportSOSMessage.h */,
+                               0C3C47C324902D460084B951 /* OTSupportSOSMessage.m */,
+                               0C89BDA121554DD3003F3CC0 /* OTAccountMetadataClassC.h */,
+                               0C89BDA021554DD2003F3CC0 /* OTAccountMetadataClassC.m */,
+                               0C9AE28B214054F5003BFDB5 /* OTApplicantToSponsorRound2M1.h */,
+                               0C9AE28E214054F6003BFDB5 /* OTApplicantToSponsorRound2M1.m */,
+                               0C9AE2A1214055CE003BFDB5 /* OTPairingMessage.h */,
+                               0C9AE2A2214055CF003BFDB5 /* OTPairingMessage.m */,
+                               0C9AE289214054F4003BFDB5 /* OTSponsorToApplicantRound1M2.h */,
+                               0C9AE28D214054F6003BFDB5 /* OTSponsorToApplicantRound1M2.m */,
+                               0C9AE28A214054F5003BFDB5 /* OTSponsorToApplicantRound2M2.h */,
+                               0C9AE290214054F7003BFDB5 /* OTSponsorToApplicantRound2M2.m */,
+                       );
+                       name = generated;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               BE7089991F9AAF57001ACC20 /* generated */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCD7DD9D22B868C200161396 /* TPPBDispositionDuplicateMachineID.h */,
+                               DCD7DD9B22B868C100161396 /* TPPBDispositionDuplicateMachineID.m */,
+                               DC730E16224011D70051DD48 /* TPPBDictionaryMatchingRule.h */,
+                               DC730E15224011D60051DD48 /* TPPBDictionaryMatchingRule.m */,
+                               DC730E1A224011DD0051DD48 /* TPPBDictionaryMatchingRuleFieldExists.h */,
+                               DC730E17224011D80051DD48 /* TPPBDictionaryMatchingRuleFieldExists.m */,
+                               DC730E18224011D90051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.h */,
+                               DC730E19224011DB0051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.m */,
+                               BEC373CA20D822CE00DBDF5B /* TPPBDispositionEntry.h */,
+                               BEC373C920D822CD00DBDF5B /* TPPBDispositionEntry.m */,
+                               BEC373AF20D815E200DBDF5B /* TPPBAncientEpoch.h */,
+                               BEC373AD20D815E100DBDF5B /* TPPBAncientEpoch.m */,
+                               BEC373B020D815E300DBDF5B /* TPPBPolicyProhibits.h */,
+                               BEC373AE20D815E200DBDF5B /* TPPBPolicyProhibits.m */,
+                               BEC373B120D815E400DBDF5B /* TPPBUnknownMachineID.h */,
+                               BEC373AC20D815E000DBDF5B /* TPPBUnknownMachineID.m */,
+                               BEC373A220CF3B5C00DBDF5B /* TPPBDisposition.h */,
+                               BEC373A320CF3B5C00DBDF5B /* TPPBDisposition.m */,
+                               DCAD8F8A22C55D73007C3872 /* TPPBDispositionDisallowedMachineID.h */,
+                               DCAD8F8B22C55D75007C3872 /* TPPBDispositionDisallowedMachineID.m */,
+                               BE7089DD1FA40B93001ACC20 /* TPPBPeerPermanentInfo.h */,
+                               BE7089DE1FA40B95001ACC20 /* TPPBPeerPermanentInfo.m */,
+                               BE7089CF1FA3BA01001ACC20 /* TPPBPeerDynamicInfo.h */,
+                               BE7089D21FA3BA03001ACC20 /* TPPBPeerDynamicInfo.m */,
+                               BE7089D31FA3BA03001ACC20 /* TPPBPolicySecret.h */,
+                               BE7089D01FA3BA01001ACC20 /* TPPBPolicySecret.m */,
+                               BE7089D41FA3BA04001ACC20 /* TPPBPeerStableInfo.h */,
+                               BE7089D11FA3BA02001ACC20 /* TPPBPeerStableInfo.m */,
+                               BE70899A1F9AAFF7001ACC20 /* TPPBVoucher.h */,
+                               BE70899B1F9AAFF7001ACC20 /* TPPBVoucher.m */,
+                               6C0C807420EAF81900334E33 /* TPPBPolicyDocument.h */,
+                               6C0C807520EAF81900334E33 /* TPPBPolicyDocument.m */,
+                               6C0C809620EB024800334E33 /* TPPBPolicyCategoriesByView.h */,
+                               6C70D8D420EB02B700AB6FAF /* TPPBPolicyCategoriesByView.m */,
+                               6C0C809720EB024900334E33 /* TPPBPolicyIntroducersByCategory.h */,
+                               6C0C809520EB024800334E33 /* TPPBPolicyIntroducersByCategory.m */,
+                               6C0C809820EB024900334E33 /* TPPBPolicyModelToCategory.h */,
+                               6C0C809920EB024900334E33 /* TPPBPolicyModelToCategory.m */,
+                               6C70D8DE20EBDFD700AB6FAF /* TPPBPolicyRedaction.h */,
+                               6C70D8DD20EBDFD600AB6FAF /* TPPBPolicyRedaction.m */,
+                               1B4C4448223AE65400C6F97F /* TPPBPolicyKeyViewMapping.h */,
+                               1B4C444A223AE65400C6F97F /* TPPBPolicyKeyViewMapping.m */,
+                       );
+                       name = generated;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               BE9F4F852072D834004A52C2 /* Cuttlefish Client */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BE9F4F8B2072D881004A52C2 /* Cuttlefish.pb.swift */,
+                               BEC0A94920AB618700DBD772 /* Cuttlefish.proto */,
+                               0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */,
+                       );
+                       name = "Cuttlefish Client";
+                       path = ../trust/cuttlefish/CuttlefishClient/Sources/CuttlefishAPI;
+                       sourceTree = "<group>";
+               };
+               BEAA002C202A832500E51F45 /* TrustedPeersHelper */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */,
+                               0CE15E29222DF5FF00B7EAA4 /* RecoveryKey */,
+                               0C3BB3312187EC4D0018FC14 /* Categories */,
+                               0C0C4F80216FB53A00C14C61 /* BottledPeer */,
+                               BE9F4F852072D834004A52C2 /* Cuttlefish Client */,
+                               BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */,
+                               BEAA002D202A832500E51F45 /* TrustedPeersHelperProtocol.h */,
+                               DC754C712228B57B00A39C8E /* TrustedPeersHelperProtocol.m */,
+                               BE55C77B2044D0C90045863D /* Client.swift */,
+                               BE9F8D0F206C099800B53D16 /* Container.swift */,
+                               DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */,
+                               0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */,
+                               DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.swift */,
+                               0C3DF8C524789C04009CF03A /* Container_Peers.swift */,
+                               DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */,
+                               DC9978B72404AA3200A5EE2F /* Container_UserSync.swift */,
+                               BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */,
+                               BE9F8D11206C121400B53D16 /* Decrypter.swift */,
+                               BECFA43C20F9493000B11002 /* Policy.swift */,
+                               BEC0A96320B362EC00DBD772 /* Utils.swift */,
+                               0CE15E2A222DF63500B7EAA5 /* SetValueTransformer.swift */,
+                               BE55C77D2044D7E60045863D /* main.swift */,
+                               BEAA0033202A832500E51F45 /* Info.plist */,
+                               BE55C77A2044D0C80045863D /* TrustedPeersHelper-Bridging-Header.h */,
+                               DC7181062089172F00B2CB13 /* TrustedPeersHelper-entitlements.plist */,
+                               DCB9475421274A1900ED9272 /* TPHObjcTranslation.m */,
+                               DCB9475721274A4D00ED9272 /* TPHObjcTranslation.h */,
+                               0CB582BA218915010040C5F2 /* proto */,
+                               DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */,
+                               DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */,
+                               DCBDA460245A39A300B0938B /* com.apple.TrustedPeersHelper.sb */,
+                       );
+                       path = TrustedPeersHelper;
+                       sourceTree = "<group>";
+               };
+               BECFA42F20F91AFE00B11002 /* tppolicy */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BECFA43020F91AFE00B11002 /* main.m */,
+                       );
+                       path = tppolicy;

                        sourceTree = "<group>";
                };
                BED208E31EDF95BB00753952 /* manifeststresstest */ = {
                        sourceTree = "<group>";
                };
                BED208E31EDF95BB00753952 /* manifeststresstest */ = {


@@ -16294,18 +19710,34 @@
                        name = manifeststresstest;
                        sourceTree = "<group>";
                };
                        name = manifeststresstest;
                        sourceTree = "<group>";
                };

+               BED987D42099145300607A5F /* TrustedPeersHelperUnitTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BED987E220991C4D00607A5F /* MockCuttlefish.swift */,
+                               BEA8557F20B5DC7D00D5AD11 /* FakeCuttlefish.swift */,
+                               BE4C6AB120CAF4E500EAD6BE /* ContainerSync.swift */,
+                               BED987D52099145300607A5F /* TrustedPeersHelperUnitTests.swift */,
+                               BED987D72099145300607A5F /* Info.plist */,
+                               BECEC0FD20A3B94C00E97255 /* TrustedPeersHelperUnitTests-BridgingHeader.h */,
+                       );
+                       path = TrustedPeersHelperUnitTests;
+                       sourceTree = "<group>";
+               };

                BEF88C451EAFFFED00357577 /* TrustedPeers */ = {
                        isa = PBXGroup;
                        children = (
                BEF88C451EAFFFED00357577 /* TrustedPeers */ = {
                        isa = PBXGroup;
                        children = (

+                               DCE0777B21ADD92B002662FD /* proto */,

                                BEF88C641EB0005F00357577 /* TrustedPeers.h */,
                                BEF88C641EB0005F00357577 /* TrustedPeers.h */,

+                               DCF458AD221F6890007F5507 /* TPLog.h */,
+                               DCF458AE221F6890007F5507 /* TPLog.m */,

                                BEF88C481EB0005E00357577 /* TPCategoryRule.h */,
                                BEF88C491EB0005E00357577 /* TPCategoryRule.m */,
                                BEF88C481EB0005E00357577 /* TPCategoryRule.h */,
                                BEF88C491EB0005E00357577 /* TPCategoryRule.m */,

-                               BEF88C4A1EB0005E00357577 /* TPCircle.h */,
-                               BEF88C4B1EB0005E00357577 /* TPCircle.m */,

                                BEF88C4C1EB0005E00357577 /* TPDecrypter.h */,
                                BEF88C4D1EB0005E00357577 /* TPEncrypter.h */,
                                BEF88C4E1EB0005E00357577 /* TPHash.h */,
                                BEF88C4F1EB0005E00357577 /* TPHash.m */,
                                BEF88C4C1EB0005E00357577 /* TPDecrypter.h */,
                                BEF88C4D1EB0005E00357577 /* TPEncrypter.h */,
                                BEF88C4E1EB0005E00357577 /* TPHash.h */,
                                BEF88C4F1EB0005E00357577 /* TPHash.m */,

+                               DC2B9A5023147A3800D4C79D /* TPMachineID.h */,
+                               DC2B9A5123147A3800D4C79D /* TPMachineID.m */,

                                BEF88C501EB0005E00357577 /* TPModel.h */,
                                BEF88C511EB0005E00357577 /* TPModel.m */,
                                BEF88C521EB0005E00357577 /* TPPeer.h */,
                                BEF88C501EB0005E00357577 /* TPModel.h */,
                                BEF88C511EB0005E00357577 /* TPModel.m */,
                                BEF88C521EB0005E00357577 /* TPPeer.h */,


@@ -16320,12 +19752,22 @@
                                BEF88C5B1EB0005E00357577 /* TPPolicy.m */,
                                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */,
                                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */,
                                BEF88C5B1EB0005E00357577 /* TPPolicy.m */,
                                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */,
                                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */,

-                               BEF88C5E1EB0005E00357577 /* TPSigningKey.h */,
+                               DCC03FA223FF521100A4DA3F /* TPSyncingPolicy.h */,
+                               DCC03FA323FF521100A4DA3F /* TPSyncingPolicy.m */,
+                               BEF88C5E1EB0005E00357577 /* TPKey.h */,
+                               BECFA46320FFB87400B11002 /* TPKey.m */,

                                BEF88C5F1EB0005E00357577 /* TPTypes.h */,
                                BEF88C5F1EB0005E00357577 /* TPTypes.h */,

-                               BEF88C601EB0005E00357577 /* TPUtils.h */,
-                               BEF88C611EB0005E00357577 /* TPUtils.m */,
-                               BEF88C621EB0005E00357577 /* TPVoucher.h */,
-                               BEF88C631EB0005F00357577 /* TPVoucher.m */,
+                               DC9061B822B02BA30071474D /* TPTypes.m */,
+                               BECEC11020A508F600E97255 /* TPVoucher.h */,
+                               BECEC11120A508F600E97255 /* TPVoucher.m */,
+                               DC88467F2237431400738068 /* TPDictionaryMatchingRules.h */,
+                               DC8846802237431400738068 /* TPDictionaryMatchingRules.m */,
+                               DA700FC62310C0DF0051A7DE /* TPStringTable.h */,
+                               DA700FC82310C0E00051A7DE /* TPStringTable.m */,
+                               BEB49F29206E98CD008DA7F4 /* TPECPublicKeyFactory.h */,
+                               BEB49F2F206E98CE008DA7F4 /* TPECPublicKeyFactory.m */,
+                               BEB49F32206E9A18008DA7F4 /* SFKey+TPKey.h */,
+                               BEB49F33206E9A19008DA7F4 /* SFKey+TPKey.m */,

                                BEF88C471EB0005E00357577 /* Info.plist */,
                                BEF88C651EB0006C00357577 /* Tests */,
                        );
                                BEF88C471EB0005E00357577 /* Info.plist */,
                                BEF88C651EB0006C00357577 /* Tests */,
                        );


@@ -16336,7 +19778,8 @@
                BEF88C651EB0006C00357577 /* Tests */ = {
                        isa = PBXGroup;
                        children = (
                BEF88C651EB0006C00357577 /* Tests */ = {
                        isa = PBXGroup;
                        children = (

-                               BEF88C671EB0008E00357577 /* TPCircleTests.m */,
+                               DC88466C2237407500738068 /* TPDictionaryMatchingRuleTests.m */,
+                               1BF640EE222EEB6C002D0FCB /* TPPolicyTests.m */,

                                BEF88C681EB0008E00357577 /* TPDummyDecrypter.h */,
                                BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */,
                                BEF88C6A1EB0008E00357577 /* TPDummyEncrypter.h */,
                                BEF88C681EB0008E00357577 /* TPDummyDecrypter.h */,
                                BEF88C691EB0008E00357577 /* TPDummyDecrypter.m */,
                                BEF88C6A1EB0008E00357577 /* TPDummyEncrypter.h */,


@@ -16350,8 +19793,10 @@
                                BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */,
                                BEF88C731EB0008E00357577 /* TPPeerTests.m */,
                                BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */,
                                BEF88C721EB0008E00357577 /* TPPeerStableInfoTests.m */,
                                BEF88C731EB0008E00357577 /* TPPeerTests.m */,
                                BEF88C741EB0008E00357577 /* TPPolicyDocumentTests.m */,

-                               BEF88C751EB0008E00357577 /* TPUtilsTests.m */,
-                               BEF88C761EB0008E00357577 /* TPVoucherTests.m */,
+                               BE72782A209D27C800F0DA77 /* TPKeyTests.m */,
+                               BEB49F36206E9B89008DA7F4 /* TPECPublicKeyFactoryTests.m */,
+                               E291657E2048BCCB0046512B /* TPPBPeerStableInfoTests.m */,
+                               DA3AD8682319AA310049AFD6 /* TPStringTableTests.m */,

                                BEF88C661EB0008E00357577 /* Info.plist */,
                        );
                        name = Tests;
                                BEF88C661EB0008E00357577 /* Info.plist */,
                        );
                        name = Tests;


@@ -16378,6 +19823,256 @@
                        path = ..;
                        sourceTree = "<group>";
                };
                        path = ..;
                        sourceTree = "<group>";
                };

+               D42C838C2115904E008D3D83 /* cms */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D42C8390211590BC008D3D83 /* CMSDecoder.cpp */,
+                               D42C8393211590D7008D3D83 /* CMSEncoder.cpp */,
+                               D42C8392211590D7008D3D83 /* CMSUtils.cpp */,
+                               D42C8391211590D6008D3D83 /* CMSUtils.h */,
+                               D4371867211682D700EA350A /* cert.c */,
+                               D4371868211682D700EA350A /* cert.h */,
+                               D4371863211682D500EA350A /* cmsarray.c */,
+                               D4371865211682D600EA350A /* cmsasn1.c */,
+                               D4371864211682D600EA350A /* cmsattr.c */,
+                               D4371866211682D600EA350A /* cmscinfo.c */,
+                               D4371862211682D500EA350A /* cmscipher.c */,
+                               D43718722116831700EA350A /* cmsdecode.c */,
+                               D43718772116831A00EA350A /* cmsdigdata.c */,
+                               D43718702116831600EA350A /* cmsdigest.c */,
+                               D43718752116831900EA350A /* cmsencdata.c */,
+                               D43718742116831800EA350A /* cmsencode.c */,
+                               D43718712116831600EA350A /* cmsenvdata.c */,
+                               D43718762116831900EA350A /* cmslocal.h */,
+                               D43718732116831700EA350A /* cmsmessage.c */,
+                               D43718822116834100EA350A /* cmspriv.h */,
+                               D43718872116834400EA350A /* cmspubkey.c */,
+                               D43718862116834300EA350A /* cmsrecinfo.c */,
+                               D43718802116834000EA350A /* cmsreclist.c */,
+                               D43718812116834000EA350A /* cmsreclist.h */,
+                               D43718842116834200EA350A /* cmssigdata.c */,
+                               D43718832116834100EA350A /* cmssiginfo.c */,
+                               D43718852116834300EA350A /* cmstpriv.h */,
+                               D43718982116836300EA350A /* cmsutil.c */,
+                               D43718932116836000EA350A /* cryptohi.c */,
+                               D43718912116835E00EA350A /* cryptohi.h */,
+                               D43718952116836100EA350A /* plhash.c */,
+                               D43718942116836000EA350A /* plhash.h */,
+                               D43718902116835E00EA350A /* secalgid.c */,
+                               D43718962116836200EA350A /* SecCMS.c */,
+                               D43718922116835F00EA350A /* secitem.c */,
+                               D43718972116836200EA350A /* secitem.h */,
+                               D43718A42116839000EA350A /* secoid.c */,
+                               D43718A52116839100EA350A /* secoid.h */,
+                               D43718A32116839000EA350A /* secoidt.h */,
+                               D43718A62116839200EA350A /* SecSMIMEPriv.h */,
+                               D43718A22116838F00EA350A /* siginfoUtils.cpp */,
+                               D43718A72116839200EA350A /* smimeutil.c */,
+                               D43718AE211683A900EA350A /* tsaSupport.c */,
+                               D43718B3211683D200EA350A /* tsaSupport.h */,
+                               D43718B2211683D100EA350A /* tsaSupportPriv.h */,
+                               D43718AF211683AA00EA350A /* tsaTemplates.c */,
+                               D43718B5211683D300EA350A /* tsaTemplates.h */,
+                               D43718BD21168BA100EA350A /* docs */,
+                               D42C83A02115953E008D3D83 /* regressions */,
+                       );
+                       name = cms;
+                       sourceTree = "<group>";
+               };
+               D42C83A02115953E008D3D83 /* regressions */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D437185C211671A300EA350A /* cms-01-basic.c */,
+                               D437185E211671A400EA350A /* cms-01-basic.h */,
+                               D437185D211671A400EA350A /* smime-cms-test.c */,
+                               D42C83A121159568008D3D83 /* cms_regressions.h */,
+                               D42C83A221159569008D3D83 /* cms-trust-settings-test.c */,
+                               D42C83A321159569008D3D83 /* cms-trust-settings-test.h */,
+                       );
+                       name = regressions;
+                       sourceTree = "<group>";
+               };
+               D43718BD21168BA100EA350A /* docs */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D43718BF21168BCD00EA350A /* libsecurity_cms.plist */,
+                               D43718BE21168BCC00EA350A /* libsecurity_cms.txt */,
+                       );
+                       name = docs;
+                       sourceTree = "<group>";
+               };
+               D458C4DC214E1A4B0043D982 /* TestRunners */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D458C4FC214E1E6C0043D982 /* appmain.m */,
+                               D458C4CA214E1A420043D982 /* AppDelegate.m */,
+                               D458C4C8214E1A410043D982 /* AppDelegate.h */,
+                               D458C4C5214E1A400043D982 /* Assets.xcassets */,
+                               D458C4CC214E1A420043D982 /* Info.plist */,
+                               D458C4C6214E1A400043D982 /* main.m */,
+                               D458C4CB214E1A420043D982 /* trusttests_entitlements.plist */,
+                               D458C4C9214E1A410043D982 /* ViewController.h */,
+                               D458C4CD214E1A430043D982 /* ViewController.m */,
+                               D458C51E214E2E0C0043D982 /* Main.storyboard */,
+                       );
+                       name = TestRunners;
+                       sourceTree = "<group>";
+               };
+               D4A0F8B9211E69A800443CA1 /* TrustTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D458C4DC214E1A4B0043D982 /* TestRunners */,
+                               D4A0F8BD211E69D500443CA1 /* DaemonTests */,
+                               D4A0F8BE211E69DF00443CA1 /* EvaluationTests */,
+                               D4A0F8BF211E69EB00443CA1 /* FrameworkTests */,
+                               D4A0F8C0211E69F500443CA1 /* TestData */,
+                               D4A0F8BA211E69CB00443CA1 /* Info.plist */,
+                               D4A0F8BB211E69CB00443CA1 /* TestMacroConversions.h */,
+                               D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */,
+                               D4A7946D22D7DD6E00D1B2B7 /* TrustEvaluationTestHelpers.h */,
+                               EB45ED2E24749DE9008A1F6F /* gen_test_plist.py */,
+                       );
+                       name = TrustTests;
+                       sourceTree = "<group>";
+               };
+               D4A0F8BD211E69D500443CA1 /* DaemonTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D4EA5CF622B225C000883439 /* LoggingServerTests.m */,
+                               D49A370B23877ECC0065719F /* OCSPCacheTests.m */,
+                               D4BA4FD22388687A000B9E64 /* OCSPCacheTests_data.h */,
+                               D477CB5B237B6E0E00C02355 /* PersonalizationTests.m */,
+                               D477CB69237CBA2C00C02355 /* TrustDaemonTestCase.m */,
+                               D477CB6D237CBACD00C02355 /* TrustDaemonTestCase.h */,
+                       );
+                       name = DaemonTests;
+                       sourceTree = "<group>";
+               };
+               D4A0F8BE211E69DF00443CA1 /* EvaluationTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D477CB8A237F8DBB00C02355 /* AllowlistBlocklistTests.m */,
+                               D477CB8D237F8EB200C02355 /* AllowlistBlocklistTests_data.h */,
+                               D477CB86237F8B2F00C02355 /* CAIssuerTests.m */,
+                               D477CB89237F8CB300C02355 /* CAIssuerTests_data.h */,
+                               D458C4AA214E198D0043D982 /* CTTests.m */,
+                               D4EF3222215F102F000A31A5 /* CTTests_data.h */,
+                               BED078F82542A2BF00FED203 /* CARevocationTests.m */,
+                               BED0781D2542A2B300FED203 /* CARevocationTests_data.h */,
+                               D4AC5766214E195300A32C01 /* ECTests.m */,
+                               D4AC5767214E195300A32C01 /* ECTests_data.h */,
+                               D458C4AE214E198E0043D982 /* EvaluationBasicTests_data.h */,
+                               D458C4AF214E198E0043D982 /* EvaluationBasicTests.m */,
+                               D477CB7A237E4BD700C02355 /* ExceptionTests.m */,
+                               D477CB7D237F321400C02355 /* ExceptionTests_data.h */,
+                               D458C4B5214E19AE0043D982 /* iAPTests.m */,
+                               D458C4AD214E198E0043D982 /* iAPTests_data.h */,
+                               D4AC5768214E195400A32C01 /* KeySizeTests.m */,
+                               D4AC5769214E195400A32C01 /* KeySizeTests_data.h */,
+                               D4FD421B217D7891002B7EE2 /* NameConstraintsTests.m */,
+                               D4FD421E217D78BB002B7EE2 /* NameConstraintsTests_data.h */,
+                               D4D92DA422788FEB0009A7CF /* NISTTests.m */,
+                               D458C4B4214E19AE0043D982 /* PathParseTests.m */,
+                               D4D92DA32277E6D10009A7CF /* PathParseTests_data.h */,
+                               D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */,
+                               D4FD4222217D7B48002B7EE2 /* PathScoringTests_data.h */,
+                               D458C513214E27620043D982 /* PolicyTests.m */,
+                               D477CB81237F692400C02355 /* RevocationTests.m */,
+                               D477CB85237F6A0700C02355 /* RevocationTests_data.h */,
+                               D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */,
+                               D458C4B6214E19AE0043D982 /* SignatureAlgorithmTests_data.h */,
+                               D423114223725F9F000E470A /* SMIMEPolicyTests.m */,
+                               D4056A1922712A650026E24E /* SSLPolicyTests.m */,
+                               D4056A1C22712AD80026E24E /* SSLPolicyTests_data.h */,
+                               D458DAC22375FEA300E5890E /* TrustSettingsTests.m */,
+                               D458DAC52375FEE900E5890E /* TrustSettingsTests_data.h */,
+                               D477CB8E237F975500C02355 /* ValidTests.m */,
+                               D4AC5764214E195200A32C01 /* VerifyDateTests.m */,
+                               D4AC5765214E195300A32C01 /* VerifyDateTests_data.h */,
+                               D4A0F8CB211E6A8200443CA1 /* TrustEvaluationTestCase.h */,
+                               D4A0F8C9211E6A8200443CA1 /* TrustEvaluationTestCase.m */,
+                       );
+                       name = EvaluationTests;
+                       sourceTree = "<group>";
+               };
+               D4A0F8BF211E69EB00443CA1 /* FrameworkTests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D4A0F8C6211E6A5700443CA1 /* CertificateInterfaceTests.m */,
+                               D4A0F8C3211E6A5600443CA1 /* CertificateInterfaceTests_data.h */,
+                               D4AC8BE721320AD0006E9871 /* CertificateParseTests.m */,
+                               D458C4BF214E19FB0043D982 /* TrustInterfaceTests.m */,
+                               D458C4C0214E19FB0043D982 /* TrustInterfaceTests_data.h */,
+                               D458C4BE214E19FA0043D982 /* TrustSettingsInterfaceTests.m */,
+                               D4A0F8C5211E6A5700443CA1 /* TrustFrameworkTestCase.h */,
+                               D4A0F8C4211E6A5700443CA1 /* TrustFrameworkTestCase.m */,
+                       );
+                       name = FrameworkTests;
+                       sourceTree = "<group>";
+               };
+               D4A0F8C0211E69F500443CA1 /* TestData */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D4231147237261F7000E470A /* SMIMEPolicyTests-data */,
+                               D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */,
+                               D4D92DA72278904F0009A7CF /* nist-certs */,
+                               D4AC8BED2132127A006E9871 /* si-18-certificate-parse */,
+                               D458C51B214E2CFF0043D982 /* si-20-sectrust-policies-data */,
+                               D4A0F8C1211E6A2F00443CA1 /* si-82-sectrust-ct-data */,
+                               D4056A1E22712D750026E24E /* si-87-sectrust-name-constraints */,
+                               D477CB76237E453C00C02355 /* si-88-sectrust-valid-data */,
+                               D4056A1D22712D740026E24E /* ssl-policy-certs */,
+                       );
+                       name = TestData;
+                       sourceTree = "<group>";
+               };
+               D4CF6E62211588140014647E /* cms */ = {
+                       isa = PBXGroup;
+                       children = (
+                               D42C83A621163866008D3D83 /* cert.h */,
+                               D4CF6E6B211588690014647E /* cmsarray.c */,
+                               D4CF6E772115886D0014647E /* cmsasn1.c */,
+                               D4CF6E66211588670014647E /* cmsattr.c */,
+                               D44D1F8521158AAC00E76E1A /* cmscinfo.c */,
+                               D4CF6E6E2115886A0014647E /* cmscipher.c */,
+                               D4CF6E732115886C0014647E /* cmsdecode.c */,
+                               D4CF6E68211588680014647E /* CMSDecoder.c */,
+                               D4CF6E7B2115886E0014647E /* cmsdigdata.c */,
+                               D44D1F8821158AAE00E76E1A /* cmsdigest.c */,
+                               D4CF6E6F2115886A0014647E /* cmsencdata.c */,
+                               D44D1F8A21158AAF00E76E1A /* cmsencode.c */,
+                               D4CF6E7C2115886F0014647E /* CMSEncoder.c */,
+                               D4CF6E7D2115886F0014647E /* cmsenvdata.c */,
+                               D4CF6E752115886C0014647E /* cmslocal.h */,
+                               D4CF6E6C211588690014647E /* cmsmessage.c */,
+                               D4CF6E64211588670014647E /* cmspriv.h */,
+                               D4CF6E65211588670014647E /* cmspubkey.c */,
+                               D4CF6E7F211588700014647E /* cmsrecinfo.c */,
+                               D44D1F8921158AAE00E76E1A /* cmsreclist.c */,
+                               D42C838721158B3F008D3D83 /* cmsreclist.h */,
+                               D4CF6E6D2115886A0014647E /* cmssigdata.c */,
+                               D44D1F8621158AAD00E76E1A /* cmssiginfo.c */,
+                               D4CF6E67211588680014647E /* cmstpriv.h */,
+                               D4CF6E782115886D0014647E /* cmsutil.c */,
+                               D4CF6E762115886D0014647E /* CMSUtils.c */,
+                               D4CF6E712115886B0014647E /* CMSUtils.h */,
+                               D44D1F8421158AAC00E76E1A /* crypto-embedded.c */,
+                               D44D1F8721158AAD00E76E1A /* cryptohi.h */,
+                               D4CF6E742115886C0014647E /* plhash.c */,
+                               D44D1F8321158AAB00E76E1A /* plhash.h */,
+                               D4CF6E69211588680014647E /* secalgid.c */,
+                               D42C838821158B40008D3D83 /* SecAsn1Item.c */,
+                               D4CF6E81211588710014647E /* SecAsn1Item.h */,
+                               D4CF6E792115886E0014647E /* secoid.c */,
+                               D4CF6E6A211588690014647E /* secoid.h */,
+                               D44D1F8B21158AAF00E76E1A /* secoidt.h */,
+                               D4CF6E63211588660014647E /* SecSMIME.h */,
+                               D4CF6E7A2115886E0014647E /* SecSMIMEPriv.h */,
+                               D4CF6E722115886B0014647E /* smimeutil.c */,
+                       );
+                       path = cms;
+                       sourceTree = "<group>";
+               };

                DA30D6771DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */ = {
                        isa = PBXGroup;
                        children = (
                DA30D6771DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */ = {
                        isa = PBXGroup;
                        children = (


@@ -16388,6 +20083,28 @@
                        path = KeychainSyncAccountUpdater;
                        sourceTree = "<group>";
                };
                        path = KeychainSyncAccountUpdater;
                        sourceTree = "<group>";
                };

+               DA41FDFC2241A7CD00838FB3 /* otpaird */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DAEF8E55225819EE00F7DF79 /* Info.plist */,
+                               DAEF8E58225819EF00F7DF79 /* OTPairingClient.h */,
+                               DAEF8E57225819EF00F7DF79 /* OTPairingClient.m */,
+                               DAEF8E59225819F000F7DF79 /* OTPairingConstants.h */,
+                               DAC58D1C2244527E00D4CD41 /* OTPairingPacketContext.h */,
+                               DAC58D1E2244528000D4CD41 /* OTPairingPacketContext.m */,
+                               DA4586572245AEDA0073F993 /* OTPairingService.h */,
+                               DA4586592245AEDA0073F993 /* OTPairingService.m */,
+                               DACAD627229F6E690002BBC3 /* OTPairingSession.h */,
+                               DACAD629229F6E6A0002BBC3 /* OTPairingSession.m */,
+                               DAC58D1F2244528100D4CD41 /* com.apple.security.otpaird.iphoneos.plist */,
+                               DAC58D1D2244527F00D4CD41 /* com.apple.security.otpaird.watchos.plist */,
+                               DA41FE192241AF3E00838FB3 /* main.m */,
+                               DA45865B2245AEDB0073F993 /* otpaird.iphoneos.entitlements */,
+                               DA45865A2245AEDB0073F993 /* otpaird.watchos.entitlements */,
+                       );
+                       path = otpaird;
+                       sourceTree = "<group>";
+               };

                DAE40BD620CF3F04002D5674 /* secitemcanarytest */ = {
                        isa = PBXGroup;
                        children = (
                DAE40BD620CF3F04002D5674 /* secitemcanarytest */ = {
                        isa = PBXGroup;
                        children = (


@@ -16397,6 +20114,15 @@
                        path = secitemcanarytest;
                        sourceTree = "<group>";
                };
                        path = secitemcanarytest;
                        sourceTree = "<group>";
                };

+               DC05037721409A4100A8EDB7 /* OCMockUmbrella */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC05037821409A4100A8EDB7 /* OCMockUmbrella.h */,
+                               DC05037921409A4100A8EDB7 /* Info.plist */,
+                       );
+                       path = OCMockUmbrella;
+                       sourceTree = "<group>";
+               };

                DC0BC4E51D8B6AA600070CB0 /* applications */ = {
                        isa = PBXGroup;
                        children = (
                DC0BC4E51D8B6AA600070CB0 /* applications */ = {
                        isa = PBXGroup;
                        children = (


@@ -16526,24 +20252,12 @@
                DC0BC64E1D8B755200070CB0 /* lib */ = {
                        isa = PBXGroup;
                        children = (
                DC0BC64E1D8B755200070CB0 /* lib */ = {
                        isa = PBXGroup;
                        children = (

-                               DC0BC6011D8B755200070CB0 /* feeCipherFile.c */,
-                               DC0BC6021D8B755200070CB0 /* feeCipherFileAtom.c */,

                                DC0BC6031D8B755200070CB0 /* byteRep.c */,
                                DC0BC6041D8B755200070CB0 /* byteRep.h */,
                                DC0BC6031D8B755200070CB0 /* byteRep.c */,
                                DC0BC6041D8B755200070CB0 /* byteRep.h */,

-                               DC0BC6051D8B755200070CB0 /* CipherFileDES.c */,
-                               DC0BC6061D8B755200070CB0 /* CipherFileDES.h */,
-                               DC0BC6071D8B755200070CB0 /* CipherFileFEED.c */,
-                               DC0BC6081D8B755200070CB0 /* CipherFileFEED.h */,
-                               DC0BC6091D8B755200070CB0 /* CipherFileTypes.h */,

                                DC0BC60A1D8B755200070CB0 /* ckconfig.h */,
                                DC0BC60A1D8B755200070CB0 /* ckconfig.h */,

-                               DC0BC60B1D8B755200070CB0 /* ckDES.c */,
-                               DC0BC60C1D8B755200070CB0 /* ckDES.h */,
-                               DC0BC60D1D8B755200070CB0 /* ckMD5.c */,

                                DC0BC60E1D8B755200070CB0 /* ckMD5.h */,
                                DC0BC60F1D8B755200070CB0 /* ckSHA1.c */,
                                DC0BC6101D8B755200070CB0 /* ckSHA1.h */,
                                DC0BC60E1D8B755200070CB0 /* ckMD5.h */,
                                DC0BC60F1D8B755200070CB0 /* ckSHA1.c */,
                                DC0BC6101D8B755200070CB0 /* ckSHA1.h */,

-                               DC0BC6111D8B755200070CB0 /* ckSHA1_priv.c */,
-                               DC0BC6121D8B755200070CB0 /* ckSHA1_priv.h */,

                                DC0BC6131D8B755200070CB0 /* ckutilities.c */,
                                DC0BC6141D8B755200070CB0 /* ckutilities.h */,
                                DC0BC6151D8B755200070CB0 /* Crypt.h */,
                                DC0BC6131D8B755200070CB0 /* ckutilities.c */,
                                DC0BC6141D8B755200070CB0 /* ckutilities.h */,
                                DC0BC6151D8B755200070CB0 /* Crypt.h */,


@@ -16552,11 +20266,9 @@
                                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */,
                                DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */,
                                DC0BC61C1D8B755200070CB0 /* curveParamData.h */,
                                DC0BC61A1D8B755200070CB0 /* CryptKitDER.cpp */,
                                DC0BC61B1D8B755200070CB0 /* CryptKitDER.h */,
                                DC0BC61C1D8B755200070CB0 /* curveParamData.h */,

-                               DC0BC61D1D8B755200070CB0 /* curveParamDataOld.h */,

                                DC0BC61E1D8B755200070CB0 /* curveParams.c */,
                                DC0BC61F1D8B755200070CB0 /* curveParams.h */,
                                DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */,
                                DC0BC61E1D8B755200070CB0 /* curveParams.c */,
                                DC0BC61F1D8B755200070CB0 /* curveParams.h */,
                                DC0BC6201D8B755200070CB0 /* ECDSA_Profile.h */,

-                               DC0BC6211D8B755200070CB0 /* ECDSA_Verify_Prefix.h */,

                                DC0BC6221D8B755200070CB0 /* elliptic.c */,
                                DC0BC6231D8B755200070CB0 /* elliptic.h */,
                                DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */,
                                DC0BC6221D8B755200070CB0 /* elliptic.c */,
                                DC0BC6231D8B755200070CB0 /* elliptic.h */,
                                DC0BC6241D8B755200070CB0 /* ellipticMeasure.h */,


@@ -16564,13 +20276,9 @@
                                DC0BC6261D8B755200070CB0 /* ellipticProj.h */,
                                DC0BC6271D8B755200070CB0 /* enc64.c */,
                                DC0BC6281D8B755200070CB0 /* enc64.h */,
                                DC0BC6261D8B755200070CB0 /* ellipticProj.h */,
                                DC0BC6271D8B755200070CB0 /* enc64.c */,
                                DC0BC6281D8B755200070CB0 /* enc64.h */,

-                               DC0BC6291D8B755200070CB0 /* engineNSA127.c */,

                                DC0BC62A1D8B755200070CB0 /* falloc.c */,
                                DC0BC62B1D8B755200070CB0 /* falloc.h */,
                                DC0BC62A1D8B755200070CB0 /* falloc.c */,
                                DC0BC62B1D8B755200070CB0 /* falloc.h */,

-                               DC0BC62C1D8B755200070CB0 /* feeCipherFile.h */,

                                DC0BC62D1D8B755200070CB0 /* feeDebug.h */,
                                DC0BC62D1D8B755200070CB0 /* feeDebug.h */,

-                               DC0BC62E1D8B755200070CB0 /* feeDES.c */,
-                               DC0BC62F1D8B755200070CB0 /* feeDES.h */,

                                DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */,
                                DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */,
                                DC0BC6321D8B755200070CB0 /* feeECDSA.c */,
                                DC0BC6301D8B755200070CB0 /* feeDigitalSignature.c */,
                                DC0BC6311D8B755200070CB0 /* feeDigitalSignature.h */,
                                DC0BC6321D8B755200070CB0 /* feeECDSA.c */,


@@ -16591,11 +20299,6 @@
                                DC0BC6411D8B755200070CB0 /* giantIntegers.c */,
                                DC0BC6421D8B755200070CB0 /* giantIntegers.h */,
                                DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */,
                                DC0BC6411D8B755200070CB0 /* giantIntegers.c */,
                                DC0BC6421D8B755200070CB0 /* giantIntegers.h */,
                                DC0BC6431D8B755200070CB0 /* giantPort_Generic.h */,

-                               DC0BC6441D8B755200070CB0 /* giantPort_i486.h */,
-                               DC0BC6451D8B755200070CB0 /* giantPort_PPC.c */,
-                               DC0BC6461D8B755200070CB0 /* giantPort_PPC.h */,
-                               DC0BC6471D8B755200070CB0 /* giantPort_PPC_Gnu.h */,
-                               DC0BC6481D8B755200070CB0 /* giantPort_PPC_Gnu.s */,

                                DC0BC6491D8B755200070CB0 /* giantPortCommon.h */,
                                DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */,
                                DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */,
                                DC0BC6491D8B755200070CB0 /* giantPortCommon.h */,
                                DC0BC64A1D8B755200070CB0 /* HmacSha1Legacy.c */,
                                DC0BC64B1D8B755200070CB0 /* HmacSha1Legacy.h */,


@@ -16911,6 +20614,7 @@
                DC0BC9D01D8B825900070CB0 /* ssl */ = {
                        isa = PBXGroup;
                        children = (
                DC0BC9D01D8B825900070CB0 /* ssl */ = {
                        isa = PBXGroup;
                        children = (

+                               1BE85ED4235CEC250051E1D8 /* sslDeprecated.h */,

                                DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */,
                                DC1786FB1D778F3C00B50D50 /* sslTypes.h */,
                                DC1785A31D778D0D00B50D50 /* CipherSuite.h */,
                                DC1786FD1D778F5000B50D50 /* SecureTransportPriv.h */,
                                DC1786FB1D778F3C00B50D50 /* sslTypes.h */,
                                DC1785A31D778D0D00B50D50 /* CipherSuite.h */,


@@ -16947,7 +20651,6 @@
                        isa = PBXGroup;
                        children = (
                                DC0BC9DB1D8B827200070CB0 /* CipherSuite.h */,
                        isa = PBXGroup;
                        children = (
                                DC0BC9DB1D8B827200070CB0 /* CipherSuite.h */,

-                               DC0BC9DC1D8B827200070CB0 /* SecureTransport.h */,

                        );
                        name = "Public Headers";
                        path = ../Security;
                        );
                        name = "Public Headers";
                        path = ../Security;


@@ -16957,6 +20660,7 @@
                        isa = PBXGroup;
                        children = (
                                DC0BC9DE1D8B827200070CB0 /* sslTypes.h */,
                        isa = PBXGroup;
                        children = (
                                DC0BC9DE1D8B827200070CB0 /* sslTypes.h */,

+                               DC0BC9DC1D8B827200070CB0 /* SecureTransport.h */,

                                DC0BC9DF1D8B827200070CB0 /* SecureTransportPriv.h */,
                        );
                        name = "Private Headers";
                                DC0BC9DF1D8B827200070CB0 /* SecureTransportPriv.h */,
                        );
                        name = "Private Headers";


@@ -16995,7 +20699,6 @@
                        isa = PBXGroup;
                        children = (
                                DC0BC9F21D8B827200070CB0 /* sslMemory.c */,
                        isa = PBXGroup;
                        children = (
                                DC0BC9F21D8B827200070CB0 /* sslMemory.c */,

-                               DC0BC9F31D8B827200070CB0 /* sslUtils.c */,

                        );
                        name = Misc.;
                        sourceTree = "<group>";
                        );
                        name = Misc.;
                        sourceTree = "<group>";


@@ -17198,6 +20901,7 @@
                                DC0BCB191D8B898100070CB0 /* SecTranslocateUtilities.cpp */,
                                DC0BCB1A1D8B898100070CB0 /* SecTranslocateUtilities.hpp */,
                                DC0BCB1B1D8B898100070CB0 /* SecTranslocateInterface.cpp */,
                                DC0BCB191D8B898100070CB0 /* SecTranslocateUtilities.cpp */,
                                DC0BCB1A1D8B898100070CB0 /* SecTranslocateUtilities.hpp */,
                                DC0BCB1B1D8B898100070CB0 /* SecTranslocateInterface.cpp */,

+                               61BDC97E242932A100A2ABD8 /* SecTranslocateEnumUtils.hpp */,

                        );
                        path = lib;
                        sourceTree = "<group>";
                        );
                        path = lib;
                        sourceTree = "<group>";


@@ -17225,17 +20929,19 @@
                DC0BCC371D8C689C00070CB0 /* utilities */ = {
                        isa = PBXGroup;
                        children = (
                DC0BCC371D8C689C00070CB0 /* utilities */ = {
                        isa = PBXGroup;
                        children = (

-                               DC0BCDB31D8C6A4A00070CB0 /* SecurityTool */,
+                               5A04BB1F2298728A001848A0 /* test */,

                                DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */,
                                DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */,
                                DC0BCC3A1D8C68CF00070CB0 /* iCloudKeychainTrace.c */,
                                DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */,

-                               EBF3749A1DC064200065D840 /* SecADWrapper.c */,
-                               EBF3749B1DC064200065D840 /* SecADWrapper.h */,
+                               EB3FBBF42320629400DF52EA /* SecABC.h */,
+                               EB3FBBF52320629400DF52EA /* SecABC.m */,

                                DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */,
                                DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */,
                                DA5B871A2065A8410093F083 /* SecAutorelease.h */,
                                DA5B871B2065A8430093F083 /* SecAutorelease.m */,
                                DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */,
                                DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */,
                                DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */,
                                DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */,
                                DA5B871A2065A8410093F083 /* SecAutorelease.h */,
                                DA5B871B2065A8430093F083 /* SecAutorelease.m */,
                                DC0BCC3E1D8C68CF00070CB0 /* SecBuffer.c */,
                                DC0BCC3F1D8C68CF00070CB0 /* SecBuffer.h */,

+                               EBE8258E2193353300102304 /* SecCoreAnalytics.h */,
+                               EBE8258F2193353300102304 /* SecCoreAnalytics.m */,

                                DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */,
                                DC0BCC411D8C68CF00070CB0 /* SecCoreCrypto.h */,
                                DC0BCC441D8C68CF00070CB0 /* SecCFCCWrappers.c */,
                                DC0BCC401D8C68CF00070CB0 /* SecCoreCrypto.c */,
                                DC0BCC411D8C68CF00070CB0 /* SecCoreCrypto.h */,
                                DC0BCC441D8C68CF00070CB0 /* SecCFCCWrappers.c */,


@@ -17247,8 +20953,12 @@
                                DC0BCC4A1D8C68CF00070CB0 /* SecCFError.h */,
                                DC0BCC4B1D8C68CF00070CB0 /* SecDispatchRelease.h */,
                                DC0BCC4C1D8C68CF00070CB0 /* SecIOFormat.h */,
                                DC0BCC4A1D8C68CF00070CB0 /* SecCFError.h */,
                                DC0BCC4B1D8C68CF00070CB0 /* SecDispatchRelease.h */,
                                DC0BCC4C1D8C68CF00070CB0 /* SecIOFormat.h */,

+                               EB71CF6322E8238000DA3D0E /* SecTapToRadar.h */,
+                               EB71CF6422E8238000DA3D0E /* SecTapToRadar.m */,

                                E78CCDC61E737F6700C1CFAA /* SecNSAdditions.m */,
                                E78CCDCD1E737F8100C1CFAA /* SecNSAdditions.h */,
                                E78CCDC61E737F6700C1CFAA /* SecNSAdditions.m */,
                                E78CCDCD1E737F8100C1CFAA /* SecNSAdditions.h */,

+                               5A04BB182298670C001848A0 /* SecXPCHelper.h */,
+                               5A04BB14229866F7001848A0 /* SecXPCHelper.m */,

                                DC0BCC4D1D8C68CF00070CB0 /* SecTrace.c */,
                                DC0BCC4E1D8C68CF00070CB0 /* SecTrace.h */,
                                EB7AE6F61E86D55400B80B15 /* SecPLWrappers.m */,
                                DC0BCC4D1D8C68CF00070CB0 /* SecTrace.c */,
                                DC0BCC4E1D8C68CF00070CB0 /* SecTrace.h */,
                                EB7AE6F61E86D55400B80B15 /* SecPLWrappers.m */,


@@ -17257,6 +20967,7 @@
                                DC0BCC521D8C68CF00070CB0 /* debugging.c */,
                                DC0BCC531D8C68CF00070CB0 /* debugging.h */,
                                DC0BCC541D8C68CF00070CB0 /* debugging_test.h */,
                                DC0BCC521D8C68CF00070CB0 /* debugging.c */,
                                DC0BCC531D8C68CF00070CB0 /* debugging.h */,
                                DC0BCC541D8C68CF00070CB0 /* debugging_test.h */,

+                               5F4C21FE2489C68900F0C425 /* simulatecrash_assert.h */,

                                DC0BCC551D8C68CF00070CB0 /* der_array.c */,
                                DC0BCC561D8C68CF00070CB0 /* der_boolean.c */,
                                DC0BCC571D8C68CF00070CB0 /* der_null.c */,
                                DC0BCC551D8C68CF00070CB0 /* der_array.c */,
                                DC0BCC561D8C68CF00070CB0 /* der_boolean.c */,
                                DC0BCC571D8C68CF00070CB0 /* der_null.c */,


@@ -17272,6 +20983,8 @@
                                DC0BCC611D8C68CF00070CB0 /* der_set.c */,
                                DC0BCC621D8C68CF00070CB0 /* der_set.h */,
                                DC0BCC631D8C68CF00070CB0 /* der_string.c */,
                                DC0BCC611D8C68CF00070CB0 /* der_set.c */,
                                DC0BCC621D8C68CF00070CB0 /* der_set.h */,
                                DC0BCC631D8C68CF00070CB0 /* der_string.c */,

+                               A6BF3B3123EB94A7009AF079 /* entitlements.h */,
+                               A6BF3B3223EB94A7009AF079 /* entitlements.c */,

                                DC0BCC641D8C68CF00070CB0 /* fileIo.c */,
                                DC0BCC651D8C68CF00070CB0 /* fileIo.h */,
                                7221843E1EC6782A004C7BED /* sec_action.c */,
                                DC0BCC641D8C68CF00070CB0 /* fileIo.c */,
                                DC0BCC651D8C68CF00070CB0 /* fileIo.h */,
                                7221843E1EC6782A004C7BED /* sec_action.c */,


@@ -17285,11 +20998,12 @@
                                E7C787311DD0FED50087FC34 /* NSURL+SOSPlistStore.m */,
                                DC0BCC6B1D8C68CF00070CB0 /* SecDb.c */,
                                DC0BCC6C1D8C68CF00070CB0 /* SecDb.h */,
                                E7C787311DD0FED50087FC34 /* NSURL+SOSPlistStore.m */,
                                DC0BCC6B1D8C68CF00070CB0 /* SecDb.c */,
                                DC0BCC6C1D8C68CF00070CB0 /* SecDb.h */,

+                               6C915BE3242E14BC00DBDAFB /* SecDbInternal.h */,

                                DC0BCC6D1D8C68CF00070CB0 /* SecFileLocations.c */,
                                DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */,
                                DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */,
                                DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */,
                                DC0BCC6D1D8C68CF00070CB0 /* SecFileLocations.c */,
                                DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */,
                                DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */,
                                DC0BCC701D8C68CF00070CB0 /* SecXPCError.c */,

-                               DC0BCC711D8C68CF00070CB0 /* simulate_crash.c */,
+                               DC0BCC711D8C68CF00070CB0 /* simulate_crash.m */,

                                DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */,
                                DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */,
                                DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */,
                                DC0BCC721D8C68CF00070CB0 /* SecSCTUtils.h */,
                                DC0BCC731D8C68CF00070CB0 /* SecSCTUtils.c */,
                                DC0BCC741D8C68CF00070CB0 /* SecAppleAnchor.c */,


@@ -17308,15 +21022,14 @@
                        children = (
                                DCC78E281D8085FC00865A7C /* AppleBaselineEscrowCertificates.h */,
                                D41149A01E7C935D00C078C7 /* AppleiPhoneDeviceCACertificates.h */,
                        children = (
                                DCC78E281D8085FC00865A7C /* AppleBaselineEscrowCertificates.h */,
                                D41149A01E7C935D00C078C7 /* AppleiPhoneDeviceCACertificates.h */,

+                               D47A085B2486EC1A000F2C49 /* AppleExternalRootCertificates.h */,

                                DCC78E301D8085FC00865A7C /* SecAccessControl.m */,
                                DCC78E301D8085FC00865A7C /* SecAccessControl.m */,

-                               443381D918A3D81400215606 /* SecAccessControl.h */,

                                443381DA18A3D81400215606 /* SecAccessControlPriv.h */,
                                DCC78E351D8085FC00865A7C /* SecBase64.c */,
                                18351B8F14CB65870097860E /* SecBase64.h */,
                                DCC78E401D8085FC00865A7C /* SecCFAllocator.c */,
                                D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */,
                                DCC78E421D8085FC00865A7C /* SecCMS.c */,
                                443381DA18A3D81400215606 /* SecAccessControlPriv.h */,
                                DCC78E351D8085FC00865A7C /* SecBase64.c */,
                                18351B8F14CB65870097860E /* SecBase64.h */,
                                DCC78E401D8085FC00865A7C /* SecCFAllocator.c */,
                                D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */,
                                DCC78E421D8085FC00865A7C /* SecCMS.c */,

-                               79BDD3C00D60DB84000D84D3 /* SecCMS.h */,

                                DCC78E441D8085FC00865A7C /* SecCTKKey.m */,
                                DCC78E451D8085FC00865A7C /* SecCTKKeyPriv.h */,
                                DCC78E381D8085FC00865A7C /* SecCertificate.c */,
                                DCC78E441D8085FC00865A7C /* SecCTKKey.m */,
                                DCC78E451D8085FC00865A7C /* SecCTKKeyPriv.h */,
                                DCC78E381D8085FC00865A7C /* SecCertificate.c */,


@@ -17338,12 +21051,15 @@
                                DC4269031E82EDAC002B7110 /* SecItem.m */,
                                DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */,
                                4CE7EA561AEAE8D60067F5BD /* SecItemBackup.h */,
                                DC4269031E82EDAC002B7110 /* SecItem.m */,
                                DCC78E5A1D8085FC00865A7C /* SecItemBackup.c */,
                                4CE7EA561AEAE8D60067F5BD /* SecItemBackup.h */,

+                               6C513A37244F007B00207D5E /* SecItemRateLimit.h */,
+                               6CF1B5C5245077E400FD8CC4 /* SecItemRateLimit_tests.h */,
+                               6C513A38244F007B00207D5E /* SecItemRateLimit.m */,

                                52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */,
                                52AA92871E662A4A004301A6 /* SecBackupKeybagEntry.h */,
                                DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */,
                                4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */,
                                DCC78E5F1D8085FC00865A7C /* SecItemShim.h */,
                                52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */,
                                52AA92871E662A4A004301A6 /* SecBackupKeybagEntry.h */,
                                DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */,
                                4CEDF7370F3A6CFB0027C4FE /* SecItemInternal.h */,
                                DCC78E5F1D8085FC00865A7C /* SecItemShim.h */,

-                               DCC78E601D8085FC00865A7C /* SecKey.c */,
+                               DCC78E601D8085FC00865A7C /* SecKey.m */,

                                DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */,
                                4C04A90811924BBC0020550C /* SecKeyInternal.h */,
                                09E9991F1F7D76550018DF67 /* SecKeyProxy.m */,
                                DCC78E621D8085FC00865A7C /* SecKeyAdaptors.m */,
                                4C04A90811924BBC0020550C /* SecKeyInternal.h */,
                                09E9991F1F7D76550018DF67 /* SecKeyProxy.m */,


@@ -17386,7 +21102,7 @@
                                DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */,
                                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */,
                                DCC78E8C1D8085FC00865A7C /* SecSharedCredential.c */,
                                DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */,
                                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */,
                                DCC78E8C1D8085FC00865A7C /* SecSharedCredential.c */,

-                               BE061FE01899ECEE00C739F6 /* SecSharedCredential.h */,
+                               BE7B8E112415579800E1CF4F /* SecSharedCredential.m */,

                                DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */,
                                DCC78E8F1D8085FC00865A7C /* SecSignatureVerificationSupport.h */,
                                DCC78E901D8085FC00865A7C /* SecTrust.c */,
                                DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */,
                                DCC78E8F1D8085FC00865A7C /* SecSignatureVerificationSupport.h */,
                                DCC78E901D8085FC00865A7C /* SecTrust.c */,


@@ -17399,7 +21115,6 @@
                                EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */,
                                DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */,
                                DCC78E9B1D8085FC00865A7C /* SecuritydXPC.h */,
                                EB6928BF1D9C9C5900062A18 /* SecRecoveryKey.m */,
                                DCC78E9A1D8085FC00865A7C /* SecuritydXPC.c */,
                                DCC78E9B1D8085FC00865A7C /* SecuritydXPC.h */,

-                               D462469C1F9AE45900D63882 /* oids.c */,

                                DCC78E2A1D8085FC00865A7C /* p12import.c */,
                                79EF5B720D3D6AFE009F5270 /* p12import.h */,
                                DCC78E2C1D8085FC00865A7C /* p12pbegen.c */,
                                DCC78E2A1D8085FC00865A7C /* p12import.c */,
                                79EF5B720D3D6AFE009F5270 /* p12import.h */,
                                DCC78E2C1D8085FC00865A7C /* p12pbegen.c */,


@@ -17409,7 +21124,6 @@
                                DCC78E9C1D8085FC00865A7C /* vmdh.c */,
                                4C7391770B01745000C4CBFA /* vmdh.h */,
                                47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */,
                                DCC78E9C1D8085FC00865A7C /* vmdh.c */,
                                4C7391770B01745000C4CBFA /* vmdh.h */,
                                47A05B101FDB5A8B00D0816E /* SFKeychainControl.h */,

-                               DCC5860120BF8A98005C7269 /* SecBase.h */,

                                DCC5860220BF8A98005C7269 /* SecBase.c */,
                        );
                        name = src;
                                DCC5860220BF8A98005C7269 /* SecBase.c */,
                        );
                        name = src;


@@ -17445,42 +21159,28 @@
                        path = OSX/utilities/Regressions;
                        sourceTree = "<group>";
                };
                        path = OSX/utilities/Regressions;
                        sourceTree = "<group>";
                };

-               DC0BCDB31D8C6A4A00070CB0 /* SecurityTool */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC65E7BE1D8CBB1500152EF0 /* readline.c */,
-                               DC65E7BF1D8CBB1500152EF0 /* readline.h */,
-                               DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */,
-                       );
-                       path = SecurityTool;
-                       sourceTree = "<group>";
-               };
-               DC1002C41D8E19D70025549C /* Products */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC1002C91D8E19D70025549C /* libsecurity_cms.a */,
-                               DC1002CB1D8E19D70025549C /* libsecurity_cms_regressions.a */,
-                       );
-                       name = Products;
-                       sourceTree = "<group>";
-               };
-               DC1002CC1D8E19F20025549C /* Products */ = {
+               DC0EF8F0208697C600AB9E95 /* tpctl */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               DC1002D31D8E19F20025549C /* security_smime */,
-                               DC1002D51D8E19F20025549C /* security_smime.framework */,
-                               DC1002D71D8E19F20025549C /* libCMS.a */,
+                               DC0EF8F1208697C600AB9E95 /* main.swift */,
+                               DCC5D66B2087FADE00BBC127 /* tpctl-bridging-header.h */,
+                               EBE2026420908A8A00B48020 /* tpctl.8 */,
+                               DCD48BFC20BF3D83009A3224 /* tpctl-objc.h */,
+                               DCD48BFD20BF3D83009A3224 /* tpctl-objc.m */,
+                               DCB41DF9216C3F8A00F219E0 /* tpctl-entitlements.plist */,

                        );
                        );

-                       name = Products;
+                       path = tpctl;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               DC1784431D77869A00B50D50 /* Products */ = {
+               DC130B7920D04CFE0065CE61 /* Categories */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               DC1784491D77869A00B50D50 /* libsecurity_smime.a */,
-                               DC17844B1D77869A00B50D50 /* libsecurity_smime_regressions.a */,
+                               DC85687F2284E79C0088D3EF /* OctagonEscrowRecoverer.h */,
+                               DC7EB920211E17E500516452 /* OTAccountMetadataClassC+KeychainSupport.h */,
+                               DC7EB921211E17E500516452 /* OTAccountMetadataClassC+KeychainSupport.m */,

                        );
                        );

-                       name = Products;
+                       name = Categories;
+                       path = categories;

                        sourceTree = "<group>";
                };
                DC1785101D77892600B50D50 /* headers */ = {
                        sourceTree = "<group>";
                };
                DC1785101D77892600B50D50 /* headers */ = {


@@ -17504,40 +21204,9 @@
                        name = headers;
                        sourceTree = "<group>";
                };
                        name = headers;
                        sourceTree = "<group>";
                };

-               DC17858D1D778B8E00B50D50 /* libsecurity_cms_headers */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC1787581D7790B600B50D50 /* CMSPrivate.h */,
-                               DC17858E1D778B9D00B50D50 /* CMSDecoder.h */,
-                               DC17858F1D778B9D00B50D50 /* CMSEncoder.h */,
-                       );
-                       name = libsecurity_cms_headers;
-                       sourceTree = "<group>";
-               };
-               DC1786FF1D778F7800B50D50 /* libsecurity_smime_headers */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E7C4D03512F9EB210022E067 /* iOS */,
-                               DC3C7ABB1D838D1100F6A832 /* macOS */,
-                       );
-                       name = libsecurity_smime_headers;
-                       sourceTree = "<group>";
-               };
-               DC17899F1D779DD600B50D50 /* SecBreadcrumb */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC1787731D77915500B50D50 /* SecBreadcrumb.h */,
-                               DC1789A01D779DEE00B50D50 /* SecBreadcrumb.c */,
-                               DC24B5701DA3274000330B48 /* breadcrumb_regressions.h */,
-                               DCE4E6D41D7A41E400AFB96E /* bc-10-knife-on-bread.m */,
-                       );
-                       name = SecBreadcrumb;
-                       sourceTree = "<group>";
-               };

                DC1789A31D779E2400B50D50 /* Security.framework macOS */ = {
                        isa = PBXGroup;
                        children = (
                DC1789A31D779E2400B50D50 /* Security.framework macOS */ = {
                        isa = PBXGroup;
                        children = (

-                               DC17899F1D779DD600B50D50 /* SecBreadcrumb */,

                                DCF783091D88B4B500E694BB /* apple_csp */,
                                DCF785E61D88B96800E694BB /* apple_cspdl */,
                                DCF787341D88C84300E694BB /* apple_file_dl */,
                                DCF783091D88B4B500E694BB /* apple_csp */,
                                DCF785E61D88B96800E694BB /* apple_cspdl */,
                                DCF787341D88C84300E694BB /* apple_file_dl */,


@@ -17549,6 +21218,7 @@
                                DCB3417A1D8A2B7A0054D16E /* cdsa_utilities */,
                                DC0BC5841D8B70D100070CB0 /* cdsa_utils */,
                                DC0BC5B81D8B721900070CB0 /* checkpw */,
                                DCB3417A1D8A2B7A0054D16E /* cdsa_utilities */,
                                DC0BC5841D8B70D100070CB0 /* cdsa_utils */,
                                DC0BC5B81D8B721900070CB0 /* checkpw */,

+                               D42C838C2115904E008D3D83 /* cms */,

                                DC0BC5EA1D8B743F00070CB0 /* comcryption */,
                                DC0BC6001D8B754000070CB0 /* cryptkit */,
                                DC0BC7441D8B76E500070CB0 /* cssm */,
                                DC0BC5EA1D8B743F00070CB0 /* comcryption */,
                                DC0BC6001D8B754000070CB0 /* cryptkit */,
                                DC0BC7441D8B76E500070CB0 /* cssm */,


@@ -17562,10 +21232,6 @@
                                DC0BC9D01D8B825900070CB0 /* ssl */,
                                DC0BCA811D8B859D00070CB0 /* transform */,
                                DC0BCB091D8B896500070CB0 /* translocate */,
                                DC0BC9D01D8B825900070CB0 /* ssl */,
                                DC0BCA811D8B859D00070CB0 /* transform */,
                                DC0BCB091D8B896500070CB0 /* translocate */,

-                               DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */,
-                               DC1786FF1D778F7800B50D50 /* libsecurity_smime_headers */,
-                               DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */,
-                               DC17858D1D778B8E00B50D50 /* libsecurity_cms_headers */,

                                DC58C4401D77BF6D003C25A4 /* config */,
                                DC1789A81D77A06800B50D50 /* Resources */,
                                DC1789A41D779E3B00B50D50 /* dummy.cpp */,
                                DC58C4401D77BF6D003C25A4 /* config */,
                                DC1789A81D77A06800B50D50 /* Resources */,
                                DC1789A41D779E3B00B50D50 /* dummy.cpp */,


@@ -17582,10 +21248,9 @@
                                D4C263C51F8FF2A9001317EA /* generateErrStrings.pl */,
                                DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */,
                                DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */,
                                D4C263C51F8FF2A9001317EA /* generateErrStrings.pl */,
                                DC178A321D77A1F500B50D50 /* SecDebugErrorMessages.strings */,
                                DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */,

-                               DC178A351D77A1F500B50D50 /* framework.sb */,

                                DC178A381D77A1F500B50D50 /* InfoPlist.strings */,
                                DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */,
                                DC178A381D77A1F500B50D50 /* InfoPlist.strings */,
                                DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */,

-                               DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings */,
+                               DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */,

                                DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */,
                                DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */,
                                DC1789A91D77A06C00B50D50 /* mds */,
                                DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */,
                                DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */,
                                DC1789A91D77A06C00B50D50 /* mds */,


@@ -17617,6 +21282,28 @@
                        name = mds;
                        sourceTree = "<group>";
                };
                        name = mds;
                        sourceTree = "<group>";
                };

+               DC2B756521F290B4003C9356 /* generated */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCAB17CF2200D26700E1DFCF /* SecEscrowPendingRecord.h */,
+                               DCAB17D02200D26800E1DFCF /* SecEscrowPendingRecord.m */,
+                       );
+                       name = generated;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               DC33071B2328567C0035CDFB /* ipc */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */,
+                               EB8908BB21F20E0200F0DDDB /* com.apple.recovery_securityd.plist */,
+                               DCE4E8091D7A4E1C00AFB96E /* com.apple.secd.plist */,
+                               EB6952BC223B783500F02C1C /* com.apple.secitemd.plist */,
+                       );
+                       name = ipc;
+                       path = ../../OSX/sec/ipc;
+                       sourceTree = "<group>";
+               };

                DC35021A1E009E0700BC0587 /* Database Helpers */ = {
                        isa = PBXGroup;
                        children = (
                DC35021A1E009E0700BC0587 /* Database Helpers */ = {
                        isa = PBXGroup;
                        children = (


@@ -17647,6 +21334,12 @@
                                DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */,
                                DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */,
                                DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */,
                                DC15F79B1E68EAD5003B9A40 /* CKKSTests+API.m */,
                                DC6593C91ED8DA9200C19462 /* CKKSTests+CurrentPointerAPI.m */,
                                DC9A2C5E1EB3F556008FAC27 /* CKKSTests+Coalesce.m */,

+                               DC86122B2408AC190092E93B /* CKKSTests+ItemSyncChoice.m */,
+                               DCBA6F2824105399009A5187 /* CKKSTests+ForwardCompatibility.m */,
+                               DC62DC6E22A8721C000D2D5D /* CKKSTests+MultiZone.h */,
+                               DC62DC6B22A87128000D2D5D /* CKKSTests+MultiZone.m */,
+                               EBC1023022EBF8AC0083D356 /* CKKSTests+LockStateTracker.m */,
+                               DC9C98C622E264F30021E29F /* CKKSFetchTests.m */,

                                DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */,
                                DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */,
                                DCBF2F7C1F90084D00ED0CA4 /* CKKSTLKSharingTests.m */,
                                DCFABF8D20081E2F001128B5 /* CKKSDeviceStateUploadTests.m */,
                                DCAD9B481F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m */,
                                DCBF2F7C1F90084D00ED0CA4 /* CKKSTLKSharingTests.m */,


@@ -17656,6 +21349,10 @@
                                DC222C891E089BAE00B09171 /* CKKSSQLTests.m */,
                                DC4DB15E1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m */,
                                DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */,
                                DC222C891E089BAE00B09171 /* CKKSSQLTests.m */,
                                DC4DB15E1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m */,
                                DC7341FD1F84642C00AB9BDF /* CKKSTLKSharingEncryptionTests.m */,

+                               DCA9BC05221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.h */,
+                               DCA9BC06221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m */,
+                               EBDE5DF922BA3D5D00A229C8 /* CKKSMockOctagonAdapter.h */,
+                               EBDE5DFA22BA3D5D00A229C8 /* CKKSMockOctagonAdapter.m */,

                                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */,
                                DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */,
                                DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */,
                                6C34462F1E24F6BE00F9522B /* CKKSRateLimiterTests.m */,
                                DCD6C4B61EC5319600414FEE /* CKKSNearFutureSchedulerTests.m */,
                                DCFE1C3C1F17EFB5007640C8 /* CKKSConditionTests.m */,


@@ -17669,9 +21366,11 @@
                                DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */,
                                6C588D791EAA149F00D7E322 /* RateLimiterTests.m */,
                                4723C9D11F1531970082882F /* CKKSLoggerTests.m */,
                                DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */,
                                6C588D791EAA149F00D7E322 /* RateLimiterTests.m */,
                                4723C9D11F1531970082882F /* CKKSLoggerTests.m */,

-                               DCF158C52064895C00B87B6D /* CKKSAPSReceiverTests.h */,
-                               DCE7F2081F21726500DDB0F7 /* CKKSAPSReceiverTests.m */,
+                               DCF158C52064895C00B87B6D /* OctagonAPSReceiverTests.h */,
+                               DCE7F2081F21726500DDB0F7 /* OctagonAPSReceiverTests.m */,

                                DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */,
                                DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */,

+                               EB0E1AD723576273002B6037 /* CKKSPBFileStorageTests.m */,
+                               EB45ED3024749E63008A1F6F /* gen_test_plist.py */,

                        );
                        name = "Tests (Local)";
                        path = tests;
                        );
                        name = "Tests (Local)";
                        path = tests;


@@ -17683,58 +21382,61 @@
                                DC3A4B5F1D91EAC500E46D4A /* CodeSigningHelper-Info.plist */,
                                DC3A4B601D91EAC500E46D4A /* com.apple.CodeSigningHelper.sb */,
                                DC3A4B621D91EAC500E46D4A /* main.cpp */,
                                DC3A4B5F1D91EAC500E46D4A /* CodeSigningHelper-Info.plist */,
                                DC3A4B601D91EAC500E46D4A /* com.apple.CodeSigningHelper.sb */,
                                DC3A4B621D91EAC500E46D4A /* main.cpp */,

+                               1FC7E8A02323303700AC3AD0 /* CodeSigningHelper.entitlements */,

                        );
                        path = CodeSigningHelper;
                        sourceTree = "<group>";
                };
                        );
                        path = CodeSigningHelper;
                        sourceTree = "<group>";
                };

-               DC3C7ABB1D838D1100F6A832 /* macOS */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DC1787001D778FA900B50D50 /* SecCMS.h */,
-                               DC1787011D778FA900B50D50 /* SecCmsBase.h */,
-                               DC1787021D778FA900B50D50 /* SecCmsContentInfo.h */,
-                               DC1787031D778FA900B50D50 /* SecCmsDecoder.h */,
-                               DC1787041D778FA900B50D50 /* SecCmsDigestContext.h */,
-                               DC1787051D778FA900B50D50 /* SecCmsDigestedData.h */,
-                               DC1787061D778FA900B50D50 /* SecCmsEncoder.h */,
-                               DC1787071D778FA900B50D50 /* SecCmsEncryptedData.h */,
-                               DC1787081D778FA900B50D50 /* SecCmsEnvelopedData.h */,
-                               DC1787091D778FA900B50D50 /* SecCmsMessage.h */,
-                               DC17870A1D778FA900B50D50 /* SecCmsRecipientInfo.h */,
-                               DC17870B1D778FA900B50D50 /* SecCmsSignedData.h */,
-                               DC17870C1D778FA900B50D50 /* SecCmsSignerInfo.h */,
-                               DC17870D1D778FA900B50D50 /* SecSMIME.h */,
-                               DC17870E1D778FA900B50D50 /* tsaSupport.h */,
-                               DC17870F1D778FA900B50D50 /* tsaSupportPriv.h */,
-                               DC1787101D778FA900B50D50 /* tsaTemplates.h */,
-                       );
-                       name = macOS;
-                       path = OSX/libsecurity_smime/lib;
-                       sourceTree = "<group>";
-               };
-               DC52EA9B1D80CC2A00B0A59C /* SecurityTool iOS */ = {
+               DC3AA2992097E60B007CA68A /* SecurityTool (shared) */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               4C4CB7100DDA44900026B660 /* entitlements.plist */,
-                               DCC78E211D8085FC00865A7C /* keychain_backup.c */,
+                               DC8506A52097E92900C712EC /* macOS security2 Resources */,
+                               DC8506A42097E8CF00C712EC /* iOS Resources */,
+                               DCC78E1C1D8085FC00865A7C /* add_internet_password.c */,

                                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */,
                                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */,

+                               BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */,
+                               DCC78E1E1D8085FC00865A7C /* codesign.c */,
+                               D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */,

                                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */,
                                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */,

-                               DC52EA911D80CC2A00B0A59C /* whoami.m */,
-                               EB48C19E1E573EDC00EC5E57 /* sos.m */,
-                               DC52EA921D80CC2A00B0A59C /* syncbubble.m */,
+                               DCC78E1F1D8085FC00865A7C /* keychain_add.c */,
+                               DCC78E211D8085FC00865A7C /* keychain_backup.c */,
+                               DCC78E201D8085FC00865A7C /* keychain_find.m */,
+                               DCC78E1A1D8085FC00865A7C /* keychain_util.c */,
+                               DCC78E1B1D8085FC00865A7C /* keychain_util.h */,
+                               473337821FDB29A200E19F30 /* KeychainCheck.h */,
+                               473337831FDB29A200E19F30 /* KeychainCheck.m */,

                                DC52EA931D80CC2A00B0A59C /* leaks.c */,
                                DC52EA941D80CC2A00B0A59C /* leaks.h */,
                                DC52EA931D80CC2A00B0A59C /* leaks.c */,
                                DC52EA941D80CC2A00B0A59C /* leaks.h */,

+                               DCC78E1D1D8085FC00865A7C /* log_control.c */,
+                               DC0BCDB41D8C6A5B00070CB0 /* not_on_this_platorm.c */,
+                               E78A9AD81D34959200006B5B /* NSFileHandle+Formatting.h */,
+                               E78A9AD91D34959200006B5B /* NSFileHandle+Formatting.m */,
+                               1BDEBEFA2252E1DD009AD3D6 /* policy_dryrun.h */,
+                               1BDEBEF72252DEB1009AD3D6 /* policy_dryrun.m */,
+                               DCC78E221D8085FC00865A7C /* pkcs12_util.c */,

                                DC52EA951D80CC2A00B0A59C /* print_cert.c */,
                                DC52EA961D80CC2A00B0A59C /* print_cert.h */,
                                DC52EA951D80CC2A00B0A59C /* print_cert.c */,
                                DC52EA961D80CC2A00B0A59C /* print_cert.h */,

-                               DC52EA971D80CC2A00B0A59C /* security.1 */,
+                               DC65E7BE1D8CBB1500152EF0 /* readline.c */,
+                               DC65E7BF1D8CBB1500152EF0 /* readline.h */,
+                               DCC78E231D8085FC00865A7C /* scep.c */,
+                               DC3AA27C2097DF94007CA68A /* security_tool_commands_table.h */,
+                               E7104A0B169E171900DB0045 /* security_tool_commands.c */,
+                               D453C47F1FFD857400DE349B /* security_tool_commands.h */,
+                               DCC78E241D8085FC00865A7C /* SecurityCommands.h */,

                                DC52EA981D80CC2A00B0A59C /* SecurityTool.c */,
                                DC52EA991D80CC2A00B0A59C /* SecurityTool.h */,
                                DC52EA981D80CC2A00B0A59C /* SecurityTool.c */,
                                DC52EA991D80CC2A00B0A59C /* SecurityTool.h */,

+                               DCC78E251D8085FC00865A7C /* show_certificates.c */,
+                               EB48C19E1E573EDC00EC5E57 /* sos.m */,
+                               DCC78E261D8085FC00865A7C /* spc.c */,
+                               E7FEFB80169E26E200E18152 /* sub_commands.h */,
+                               DC52EA921D80CC2A00B0A59C /* syncbubble.m */,

                                DC52EA9A1D80CC2A00B0A59C /* tool_errors.h */,
                                DC52EA9A1D80CC2A00B0A59C /* tool_errors.h */,

-                               473337821FDB29A200E19F30 /* KeychainCheck.h */,
-                               473337831FDB29A200E19F30 /* KeychainCheck.m */,
+                               D453C38A1FEC669300DE349B /* trust_update.m */,
+                               DCC78E191D8085FC00865A7C /* verify_cert.c */,
+                               DC52EA911D80CC2A00B0A59C /* whoami.m */,

                        );
                        );

-                       name = "SecurityTool iOS";
-                       path = OSX/sec/SecurityTool;
+                       name = "SecurityTool (shared)";
+                       path = sharedTool;

                        sourceTree = "<group>";
                };
                DC58C4391D77BEA1003C25A4 /* csparser */ = {
                        sourceTree = "<group>";
                };
                DC58C4391D77BEA1003C25A4 /* csparser */ = {


@@ -17760,8 +21462,9 @@
                DC59E9AA1D91C9BE001BDDF5 /* Security.framework (Shared) */ = {
                        isa = PBXGroup;
                        children = (
                DC59E9AA1D91C9BE001BDDF5 /* Security.framework (Shared) */ = {
                        isa = PBXGroup;
                        children = (

+                               5A442F97233C34C000918373 /* experiment */,
+                               5AF593FD1FA0EE2C00A5C1EC /* Protocol */,

                                DCC78E4F1D8085FC00865A7C /* SecFramework.c */,
                                DCC78E4F1D8085FC00865A7C /* SecFramework.c */,

-                               AA44E0CF2032511C001EA371 /* Protocol */,

                                4723C9B51F152E8E0082882F /* Analytics */,
                                DCD067621D8CDE9B007602F1 /* codesigning */,
                                DCD06AA81D8E0D3D007602F1 /* security_utilities */,
                                4723C9B51F152E8E0082882F /* Analytics */,
                                DCD067621D8CDE9B007602F1 /* codesigning */,
                                DCD06AA81D8E0D3D007602F1 /* security_utilities */,


@@ -17782,13 +21485,14 @@
                                DC5ABDBE1D832D5800CF422C /* Source */,
                        );
                        name = "SecurityTool macOS";
                                DC5ABDBE1D832D5800CF422C /* Source */,
                        );
                        name = "SecurityTool macOS";

+                       path = macOS;

                        sourceTree = "<group>";
                };
                DC5ABDBE1D832D5800CF422C /* Source */ = {
                        isa = PBXGroup;
                        children = (
                        sourceTree = "<group>";
                };
                DC5ABDBE1D832D5800CF422C /* Source */ = {
                        isa = PBXGroup;
                        children = (

-                               F9C8AFC5223740C700E7D6AE /* requirement.c */,
-                               F9C8AFCB223740C800E7D6AE /* requirement.h */,
+                               F9F77E96223C2F7B00E5CBF6 /* requirement.c */,
+                               F9F77E97223C2F7C00E5CBF6 /* requirement.h */,

                                DC5ABD781D832D5800CF422C /* srCdsaUtils.cpp */,
                                DC5ABD791D832D5800CF422C /* srCdsaUtils.h */,
                                DC5ABD7A1D832D5800CF422C /* createFVMaster.c */,
                                DC5ABD781D832D5800CF422C /* srCdsaUtils.cpp */,
                                DC5ABD791D832D5800CF422C /* srCdsaUtils.h */,
                                DC5ABD7A1D832D5800CF422C /* createFVMaster.c */,


@@ -17843,6 +21547,8 @@
                                DC5ABDAB1D832D5800CF422C /* security_tool.h */,
                                DC5ABDAC1D832D5800CF422C /* trusted_cert_add.c */,
                                DC5ABDAD1D832D5800CF422C /* trusted_cert_add.h */,
                                DC5ABDAB1D832D5800CF422C /* security_tool.h */,
                                DC5ABDAC1D832D5800CF422C /* trusted_cert_add.c */,
                                DC5ABDAD1D832D5800CF422C /* trusted_cert_add.h */,

+                               BE64A7FE22AF010A001209F3 /* trusted_cert_ssl.m */,
+                               BE64A7FD22AF0109001209F3 /* trusted_cert_ssl.h */,

                                DC5ABDAE1D832D5800CF422C /* trusted_cert_utils.c */,
                                DC5ABDAF1D832D5800CF422C /* trusted_cert_utils.h */,
                                DC5ABDB01D832D5800CF422C /* trust_settings_impexp.h */,
                                DC5ABDAE1D832D5800CF422C /* trusted_cert_utils.c */,
                                DC5ABDAF1D832D5800CF422C /* trusted_cert_utils.h */,
                                DC5ABDB01D832D5800CF422C /* trust_settings_impexp.h */,


@@ -17861,7 +21567,6 @@
                                DC5ABDBD1D832D5800CF422C /* translocate.h */,
                        );
                        name = Source;
                                DC5ABDBD1D832D5800CF422C /* translocate.h */,
                        );
                        name = Source;

-                       path = SecurityTool;

                        sourceTree = "<group>";
                };
                DC5ABDC01D832D5D00CF422C /* Documentation */ = {
                        sourceTree = "<group>";
                };
                DC5ABDC01D832D5D00CF422C /* Documentation */ = {


@@ -17870,7 +21575,6 @@
                                DC5ABDBF1D832D5D00CF422C /* security.1 */,
                        );
                        name = Documentation;
                                DC5ABDBF1D832D5D00CF422C /* security.1 */,
                        );
                        name = Documentation;

-                       path = SecurityTool;

                        sourceTree = "<group>";
                };
                DC5ABF791D83510300CF422C /* securityd macOS */ = {
                        sourceTree = "<group>";
                };
                DC5ABF791D83510300CF422C /* securityd macOS */ = {


@@ -18038,8 +21742,6 @@
                DC5ABFC41D83511A00CF422C /* Code Signing */ = {
                        isa = PBXGroup;
                        children = (
                DC5ABFC41D83511A00CF422C /* Code Signing */ = {
                        isa = PBXGroup;
                        children = (

-                               DC5ABFC21D83511A00CF422C /* csproxy.h */,
-                               DC5ABFC31D83511A00CF422C /* csproxy.cpp */,

                        );
                        name = "Code Signing";
                        sourceTree = "<group>";
                        );
                        name = "Code Signing";
                        sourceTree = "<group>";


@@ -18048,6 +21750,8 @@
                        isa = PBXGroup;
                        children = (
                                DC5ABFC51D83511A00CF422C /* agentclient.h */,
                        isa = PBXGroup;
                        children = (
                                DC5ABFC51D83511A00CF422C /* agentclient.h */,

+                               1BC6F79821C9955E005ED67A /* util.h */,
+                               1BC6F79621C9955D005ED67A /* util.m */,

                                DC5ABFC61D83511A00CF422C /* agentquery.h */,
                                DC5ABFC71D83511A00CF422C /* agentquery.cpp */,
                                DC5ABFC81D83511A00CF422C /* auditevents.h */,
                                DC5ABFC61D83511A00CF422C /* agentquery.h */,
                                DC5ABFC71D83511A00CF422C /* agentquery.cpp */,
                                DC5ABFC81D83511A00CF422C /* auditevents.h */,


@@ -18060,6 +21764,8 @@
                                DC5ABFD11D83511A00CF422C /* notifications.cpp */,
                                DC5ABFD21D83511A00CF422C /* SharedMemoryServer.h */,
                                DC5ABFD31D83511A00CF422C /* SharedMemoryServer.cpp */,
                                DC5ABFD11D83511A00CF422C /* notifications.cpp */,
                                DC5ABFD21D83511A00CF422C /* SharedMemoryServer.h */,
                                DC5ABFD31D83511A00CF422C /* SharedMemoryServer.cpp */,

+                               6C755604242121F000025D78 /* keychainstasherinterface.h */,
+                               6C755603242121F000025D78 /* keychainstasherinterface.m */,

                        );
                        name = Support;
                        sourceTree = "<group>";
                        );
                        name = Support;
                        sourceTree = "<group>";


@@ -18117,8 +21823,10 @@
                DC5ABFE31D83513C00CF422C /* resources */ = {
                        isa = PBXGroup;
                        children = (
                DC5ABFE31D83513C00CF422C /* resources */ = {
                        isa = PBXGroup;
                        children = (

+                               6C23F02C227A39E9009F6756 /* com.apple.securityd.sb */,

                                DC5ABFE21D83513C00CF422C /* securityd.order */,
                                DC5ABFE41D83514700CF422C /* com.apple.securityd.plist */,
                                DC5ABFE21D83513C00CF422C /* securityd.order */,
                                DC5ABFE41D83514700CF422C /* com.apple.securityd.plist */,

+                               09C3E08B22A83B40004ACFC4 /* securityd.entitlements */,

                        );
                        name = resources;
                        path = securityd/src;
                        );
                        name = resources;
                        path = securityd/src;


@@ -18148,8 +21856,6 @@
                DC5AC1FD1D83647300CF422C /* SecureObjectSync */ = {
                        isa = PBXGroup;
                        children = (
                DC5AC1FD1D83647300CF422C /* SecureObjectSync */ = {
                        isa = PBXGroup;
                        children = (

-                               DCC78DA11D8085F200865A7C /* SOSCircle */,
-                               F93C49391AB8FF530047E01A /* ckcdiagnose */,

                                4C52D0B616EFC61E0079966E /* CircleJoinRequested */,
                                5346480317331E1200FE9172 /* KeychainSyncAccountNotification */,
                                DA30D6771DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */,
                                4C52D0B616EFC61E0079966E /* CircleJoinRequested */,
                                5346480317331E1200FE9172 /* KeychainSyncAccountNotification */,
                                DA30D6771DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */,


@@ -18166,12 +21872,10 @@
                        isa = PBXGroup;
                        children = (
                                DC5ABD281D832D4C00CF422C /* SecurityTool macOS */,
                        isa = PBXGroup;
                        children = (
                                DC5ABD281D832D4C00CF422C /* SecurityTool macOS */,

-                               4CB740FA0A47580400D641BB /* Security2Tool macOS */,
-                               DC52EA9B1D80CC2A00B0A59C /* SecurityTool iOS */,
-                               DCC78E271D8085FC00865A7C /* Security/Tool */,
+                               DC3AA2992097E60B007CA68A /* SecurityTool (shared) */,

                        );
                        );

-                       name = SecurityTool;
-                       sourceTree = "<group>";
+                       path = SecurityTool;
+                       sourceTree = SOURCE_ROOT;

                };
                DC5AC1FF1D83650C00CF422C /* securityd */ = {
                        isa = PBXGroup;
                };
                DC5AC1FF1D83650C00CF422C /* securityd */ = {
                        isa = PBXGroup;


@@ -18185,8 +21889,7 @@
                DC5AC2001D83653E00CF422C /* resources */ = {
                        isa = PBXGroup;
                        children = (
                DC5AC2001D83653E00CF422C /* resources */ = {
                        isa = PBXGroup;
                        children = (

-                               DCEE1E851D93424D00DC0EB7 /* com.apple.securityd.plist */,
-                               DCE4E8091D7A4E1C00AFB96E /* com.apple.secd.plist */,
+                               DC33071B2328567C0035CDFB /* ipc */,

                                DC9EBA2F1DEE651500D0F733 /* Info-macOS.plist */,
                        );
                        name = resources;
                                DC9EBA2F1DEE651500D0F733 /* Info-macOS.plist */,
                        );
                        name = resources;


@@ -18195,7 +21898,10 @@
                DC5AC2011D83663C00CF422C /* tests */ = {
                        isa = PBXGroup;
                        children = (
                DC5AC2011D83663C00CF422C /* tests */ = {
                        isa = PBXGroup;
                        children = (

-                               47C51B851EEA657D0032D9E5 /* SecurityUnitTests */,
+                               6C534E0422C3E52600D4781F /* Discovery Plists */,
+                               6C0535F422B7043B0064BA50 /* TestHostBinaries */,
+                               EBDAF14021C75FC800EAE89F /* SharedMocks */,
+                               DC05037721409A4100A8EDB7 /* OCMockUmbrella */,

                                F667EC541E96E8C800203D5C /* authdtests */,
                                EB1055641E14DB370003C309 /* secfuzzer */,
                                DC0BCBD81D8C646700070CB0 /* regressionBase */,
                                F667EC541E96E8C800203D5C /* authdtests */,
                                EB1055641E14DB370003C309 /* secfuzzer */,
                                DC0BCBD81D8C646700070CB0 /* regressionBase */,


@@ -18212,6 +21918,9 @@
                                0C2BCBA41D063F7D00ED7A2F /* dtlsEcho */,
                                4727FBB81F9918590003AE36 /* secdxctests */,
                                EB49B2AF202D8780003F34A0 /* secdmockaks */,
                                0C2BCBA41D063F7D00ED7A2F /* dtlsEcho */,
                                4727FBB81F9918590003AE36 /* secdxctests */,
                                EB49B2AF202D8780003F34A0 /* secdmockaks */,

+                               6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */,
+                               D4A0F8B9211E69A800443CA1 /* TrustTests */,
+                               6C963282242A279B00C53CE2 /* stashtester */,

                        );
                        name = tests;
                        sourceTree = "<group>";
                        );
                        name = tests;
                        sourceTree = "<group>";


@@ -18267,6 +21976,32 @@
                        name = gk_reset_check;
                        sourceTree = "<group>";
                };
                        name = gk_reset_check;
                        sourceTree = "<group>";
                };

+               DC68527020D04A3200C61368 /* IPC */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC124DC120059B8700BE8DAC /* OctagonControlServer.h */,
+                               DC124DC220059B8700BE8DAC /* OctagonControlServer.m */,
+                               0C8BBF0C1FCB452200580909 /* OTControlProtocol.h */,
+                               0C8BBF0D1FCB452300580909 /* OTControlProtocol.m */,
+                       );
+                       name = IPC;
+                       sourceTree = "<group>";
+               };
+               DC68527120D04A5800C61368 /* Framework */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CDBCD8620AD03FB007F8EA7 /* OTClique.h */,
+                               0CD743BA23C3EF0D00FA0EC5 /* OTClique+Private.h */,
+                               0C2F336A20DD643B0031A92D /* OTClique.m */,
+                               0C8BBF0B1FCB452200580909 /* OTControl.h */,
+                               0C8BBF0E1FCB452400580909 /* OTControl.m */,
+                               EB10A3E320356E2000E84270 /* OTConstants.h */,
+                               EB10A3E420356E2000E84270 /* OTConstants.m */,
+                               0C0203DE23A855B8005D0A68 /* proto */,
+                       );
+                       name = Framework;
+                       sourceTree = "<group>";
+               };

                DC6A82061D87731C00418608 /* libsecurityd */ = {
                        isa = PBXGroup;
                        children = (
                DC6A82061D87731C00418608 /* libsecurityd */ = {
                        isa = PBXGroup;
                        children = (


@@ -18354,7 +22089,6 @@
                                DC6A82771D87733C00418608 /* ss_types.defs */,
                                DC6A82781D87733C00418608 /* ucsp.defs */,
                                DC6A82791D87733C00418608 /* ucspNotify.defs */,
                                DC6A82771D87733C00418608 /* ss_types.defs */,
                                DC6A82781D87733C00418608 /* ucsp.defs */,
                                DC6A82791D87733C00418608 /* ucspNotify.defs */,

-                               DC6A827A1D87733C00418608 /* cshosting.defs */,

                        );
                        name = mig;
                        path = OSX/libsecurityd/mig;
                        );
                        name = mig;
                        path = OSX/libsecurityd/mig;


@@ -18370,9 +22104,6 @@
                                DC6A82811D87734600418608 /* ucspServer.cpp */,
                                DC6A82821D87734600418608 /* ucspNotifySender.cpp */,
                                DC6A82831D87734600418608 /* ucspNotifyReceiver.cpp */,
                                DC6A82811D87734600418608 /* ucspServer.cpp */,
                                DC6A82821D87734600418608 /* ucspNotifySender.cpp */,
                                DC6A82831D87734600418608 /* ucspNotifyReceiver.cpp */,

-                               DC6A82841D87734600418608 /* cshosting.h */,
-                               DC6A82851D87734600418608 /* cshostingClient.cpp */,
-                               DC6A82861D87734600418608 /* cshostingServer.cpp */,

                        );
                        path = derived_src;
                        sourceTree = BUILT_PRODUCTS_DIR;
                        );
                        path = derived_src;
                        sourceTree = BUILT_PRODUCTS_DIR;


@@ -18380,22 +22111,64 @@
                DC6D2C941DD3B20400BE372D /* keychain */ = {
                        isa = PBXGroup;
                        children = (
                DC6D2C941DD3B20400BE372D /* keychain */ = {
                        isa = PBXGroup;
                        children = (

+                               6C34464D1E2534C200F9522B /* analytics */,

                                DCAE1DCF2073FCA400B4F687 /* categories */,
                                DCAE1DCF2073FCA400B4F687 /* categories */,

-                               0C7CEA391FE9CE3900125C79 /* behavior */,
-                               0C8BBEF61FCB402900580909 /* otctl */,
-                               0C8BBE831FC9DA1700580909 /* Octagon Trust */,
-                               0CF0E2DD1F8EE37C00BD18E4 /* Signin Metrics */,

                                EB27FF051E402C3C00EC9E3A /* ckksctl */,
                                EB27FF051E402C3C00EC9E3A /* ckksctl */,

-                               6C34464D1E2534C200F9522B /* Analytics */,
-                               BEF88C451EAFFFED00357577 /* TrustedPeers */,
+                               0CD743A723C3EC8000FA0EC5 /* OctagonTrust */,

                                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */,
                                470D96651FCDE45C0065FE90 /* CoreDataKeychain */,
                                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */,
                                470D96651FCDE45C0065FE90 /* CoreDataKeychain */,

-                               47C2F1852059CB680062DE30 /* KeychainResources */,

                                4771D974209A755800BA9772 /* KeychainDataclassOwner */,
                                4771D974209A755800BA9772 /* KeychainDataclassOwner */,

+                               47C2F1852059CB680062DE30 /* KeychainResources */,
+                               EB74CC182207E48000F1BBAD /* KeychainSettings */,
+                               6C997868242362EC008C498D /* KeychainStasher */,
+                               0C8BBE831FC9DA1700580909 /* OT */,
+                               0C8BBEF61FCB402900580909 /* otctl */,
+                               DA41FDFC2241A7CD00838FB3 /* otpaird */,
+                               DC90A4BD21F275EC001300EB /* escrowrequest */,
+                               BED01530206F050F0027A2B4 /* README.txt */,
+                               DCC78D911D8085F200865A7C /* SecureObjectSync */,
+                               47C51B851EEA657D0032D9E5 /* SecurityUnitTests */,
+                               0CF0E2DD1F8EE37C00BD18E4 /* SigninMetrics */,
+                               DC0EF8F0208697C600AB9E95 /* tpctl */,
+                               BECFA42F20F91AFE00B11002 /* tppolicy */,
+                               47B3A90B21027D71001F4281 /* Trieste */,
+                               BEF88C451EAFFFED00357577 /* TrustedPeers */,
+                               BEAA002C202A832500E51F45 /* TrustedPeersHelper */,
+                               BED987D42099145300607A5F /* TrustedPeersHelperUnitTests */,
+                               0C7382E52386379E004F98CB /* ResetCloudKeychainAccount */,

                        );
                        path = keychain;
                        sourceTree = "<group>";
                };
                        );
                        path = keychain;
                        sourceTree = "<group>";
                };

+               DC7FC44121EE6F4E003C39B8 /* featureflags */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC79572C21EEB62400761E21 /* Info.plist */,
+                               DC7FC44321EE6F7B003C39B8 /* Security.plist */,
+                       );
+                       path = featureflags;
+                       sourceTree = "<group>";
+               };
+               DC8506A42097E8CF00C712EC /* iOS Resources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC52EA971D80CC2A00B0A59C /* security.1 */,
+                               DC52EA901D80CC2A00B0A59C /* entitlements.plist */,
+                       );
+                       name = "iOS Resources";
+                       path = iOS;
+                       sourceTree = "<group>";
+               };
+               DC8506A52097E92900C712EC /* macOS security2 Resources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCE4E6A71D7A38C000AFB96E /* security2.1 */,
+                               4C4CB7100DDA44900026B660 /* entitlements.plist */,
+                       );
+                       name = "macOS security2 Resources";
+                       path = macOS;
+                       sourceTree = "<group>";
+               };

                DC8834001D8A217200CE0ACA /* ASN1 */ = {
                        isa = PBXGroup;
                        children = (
                DC8834001D8A217200CE0ACA /* ASN1 */ = {
                        isa = PBXGroup;
                        children = (


@@ -18408,6 +22181,7 @@
                DC8834501D8A21AA00CE0ACA /* lib */ = {
                        isa = PBXGroup;
                        children = (
                DC8834501D8A21AA00CE0ACA /* lib */ = {
                        isa = PBXGroup;
                        children = (

+                               1BE85ED1235CEBB30051E1D8 /* secport-tapi.h */,

                                DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */,
                                DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */,
                                DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */,
                                DC88340A1D8A21AA00CE0ACA /* SecAsn1Coder.c */,
                                DC88340C1D8A21AA00CE0ACA /* SecAsn1Templates.c */,
                                DC88340F1D8A21AA00CE0ACA /* certExtensionTemplates.c */,


@@ -18469,6 +22243,76 @@
                        path = OSX/libsecurity_asn1/lib;
                        sourceTree = "<group>";
                };
                        path = OSX/libsecurity_asn1/lib;
                        sourceTree = "<group>";
                };

+               DC90A4BD21F275EC001300EB /* escrowrequest */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCD33D95220CFF93000A390B /* operations */,
+                               DCA9D83A21FFDB7400B27421 /* tests */,
+                               DC90A4BF21F27636001300EB /* Framework */,
+                               DC2B756521F290B4003C9356 /* generated */,
+                               DC90A4C621F279D4001300EB /* SecEscrowPendingRecord.proto */,
+                               DCAB17D32200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.h */,
+                               DCAB17D42200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.m */,
+                               DCA9D84B21FFF04600B27421 /* EscrowRequestServer.h */,
+                               DCA9D84C21FFF04700B27421 /* EscrowRequestServer.m */,
+                               DC4A76A4221267FB006F2D8F /* EscrowRequestServerHelpers.h */,
+                               DC4A76A2221267D4006F2D8F /* EscrowRequestServerHelpers.m */,
+                               DCA9D83D21FFE50A00B27421 /* EscrowRequestXPCServer.h */,
+                               DCA9D83C21FFE50900B27421 /* EscrowRequestXPCServer.m */,
+                               DCA9D83F21FFE62A00B27421 /* EscrowRequestXPCProtocol.h */,
+                               DCA9D84521FFE7CF00B27421 /* EscrowRequestXPCProtocol.m */,
+                               DCD33D79220B985A000A390B /* EscrowRequestController.h */,
+                               DCD33D7A220B985A000A390B /* EscrowRequestController.m */,
+                       );
+                       path = escrowrequest;
+                       sourceTree = "<group>";
+               };
+               DC90A4BF21F27636001300EB /* Framework */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC90A4C021F27680001300EB /* SecEscrowRequest.h */,
+                               DC90A4C121F27680001300EB /* SecEscrowRequest.m */,
+                       );
+                       path = Framework;
+                       sourceTree = "<group>";
+               };
+               DC99B89720EAD4D20065B73B /* Octagon */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCEA0FF6213F1E6F0054A328 /* Octagon.plist */,
+                               DC7EB928211E20DF00516452 /* OctagonDataPersistenceTests.swift */,
+                               DC85687C2284E7850088D3EF /* OctagonTestMocks.swift */,
+                               DC27C3C820EADD8200F7839C /* OctagonTests-BridgingHeader.h */,
+                               DC99B89320EACA480065B73B /* OctagonTests-Info.plist */,
+                               DC27C3C020EAD9C300F7839C /* OctagonTests.swift */,
+                               DC4415B323610BF40087981C /* OctagonTests+Account.swift */,
+                               DC7F79B522EA4ED4001FB69A /* OctagonTests+CKKS.swift */,
+                               DCE405C423A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift */,
+                               DC5BEACC2217509A001681F0 /* OctagonTests+CloudKitAccount.swift */,
+                               DC5F2BBD2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift */,
+                               DC2819B822F8F6FE007829F5 /* OctagonTests+DeviceList.swift */,
+                               DC07090222936BCC002711B9 /* OctagonTests+ErrorHandling.swift */,
+                               0CBF883A23AAD9DC00652EDD /* OctagonTests+EscrowRecords.swift */,
+                               DCDF03112284E34B008055BA /* OctagonTests+EscrowRecovery.swift */,
+                               DC7F6A7C233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift */,
+                               0C5824A322860001009E8C15 /* OctagonTests+HealthCheck.swift */,
+                               DC4CD9822372294D00EF55FC /* OctagonTests+Helpers.swift */,
+                               0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */,
+                               DC72502D229600A800493D88 /* OctagonTests+Reset.swift */,
+                               0C87D3E2229368A7007853B5 /* OctagonTests+SOS.swift */,
+                               DCB947592127534C00ED9272 /* OctagonTests+SOSUpgrade.swift */,
+                               0CA1D0B223E9023100021038 /* OctagonTests+EscrowTestVectors.swift */,
+                               DCFF82702162834C00D54B02 /* OctagonTestsXPCConnections.swift */,
+                               5A04BAF922973EA9001848A0 /* OTFollowupTests.m */,
+                               DCC0A4C52152C4AB000AF654 /* Pairing */,
+                               0CBEF3422242C9BE00015691 /* TestsObjcTranslation.h */,
+                               0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */,
+                               DCA7F7EE23A44AA200927989 /* OctagonPolicyTests.swift */,
+                       );
+                       name = Octagon;
+                       path = octagon;
+                       sourceTree = "<group>";
+               };

                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */ = {
                        isa = PBXGroup;
                        children = (
                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */ = {
                        isa = PBXGroup;
                        children = (


@@ -18478,27 +22322,38 @@
                                DCD662EB1E32946000188186 /* Sync Objects */,
                                DCD662F11E32946E00188186 /* Operations */,
                                DC3502B61E0208BE00BC0587 /* Tests (Local) */,
                                DCD662EB1E32946000188186 /* Sync Objects */,
                                DCD662F11E32946E00188186 /* Operations */,
                                DC3502B61E0208BE00BC0587 /* Tests (Local) */,

-                               DCA4D2121E5651950056214F /* Tests (Live CloudKit) */,

                                DC1ED8C21DD5538C002BDCFA /* CKKS.h */,
                                DC1ED8C51DD55476002BDCFA /* CKKS.m */,
                                DC1ED8C21DD5538C002BDCFA /* CKKS.h */,
                                DC1ED8C51DD55476002BDCFA /* CKKS.m */,

+                               DC880F67243D4CC00059806D /* CKKSLogging.m */,
+                               DCC40B0F2383786D00402CB9 /* CKKSStates.h */,
+                               DCC40B102383786D00402CB9 /* CKKSStates.m */,
+                               DC391F9921BF2F4B00772585 /* CKKSConstants.m */,

                                DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */,
                                DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */,
                                DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */,
                                DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */,

+                               DCA9BC00221B721D00B4EB26 /* CKKSCloudKitClassDependencies.h */,
+                               DCA9BC01221B721E00B4EB26 /* CKKSCloudKitClassDependencies.m */,

                                DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */,
                                DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */,
                                DCBDB3B01E57C67500B61300 /* CKKSKeychainView.h */,
                                DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */,
                                DC9FD3281F8598F300C8AAC8 /* CKKSPeer.h */,
                                DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */,
                                DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */,
                                DCBDB3BA1E57CA7A00B61300 /* CKKSViewManager.m */,
                                DCBDB3B01E57C67500B61300 /* CKKSKeychainView.h */,
                                DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */,
                                DC9FD3281F8598F300C8AAC8 /* CKKSPeer.h */,
                                DC9FD3291F8598F300C8AAC8 /* CKKSPeer.m */,

+                               DC1E5AB423063A4D00918162 /* CKKSPeerProvider.h */,
+                               DC1E5AB523063A4E00918162 /* CKKSPeerProvider.m */,

                                DC1ED8C01DD51890002BDCFA /* CKKSItemEncrypter.h */,
                                DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */,
                                6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */,
                                6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */,
                                DC1ED8C01DD51890002BDCFA /* CKKSItemEncrypter.h */,
                                DC1ED8BA1DD51883002BDCFA /* CKKSItemEncrypter.m */,
                                6CC185971E24E87D009657D8 /* CKKSRateLimiter.h */,
                                6CC185981E24E87D009657D8 /* CKKSRateLimiter.m */,

+                               EB97364F234E8F4A00518B2B /* CKKSPBFileStorage.h */,
+                               EB973650234E8F4B00518B2B /* CKKSPBFileStorage.m */,

                                6CA2B9431E9F9F5700C43444 /* RateLimiter.h */,
                                6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */,
                                DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */,
                                DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */,
                                DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */,
                                DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */,
                                6CA2B9431E9F9F5700C43444 /* RateLimiter.h */,
                                6CC7F5B31E9F99EE0014AE63 /* RateLimiter.m */,
                                DC9C95B21F79CFD1000D19E5 /* CKKSControl.h */,
                                DC9C95B31F79CFD1000D19E5 /* CKKSControl.m */,
                                DA6AA1641FE88AFA004565B0 /* CKKSControlServer.h */,
                                DA6AA15E1FE88AF9004565B0 /* CKKSControlServer.m */,

+                               479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */,
+                               479108B61EE879F9008CEFA0 /* CKKSAnalytics.m */,

                        );
                        name = "CloudKit Syncing";
                        path = ckks;
                        );
                        name = "CloudKit Syncing";
                        path = ckks;


@@ -18507,35 +22362,21 @@
                DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */ = {
                        isa = PBXGroup;
                        children = (
                DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */ = {
                        isa = PBXGroup;
                        children = (

-                               DC9FD3251F858BAD00C8AAC8 /* derived source */,
+                               DC9FD3251F858BAD00C8AAC8 /* generated */,

                                DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */,
                        );
                        name = "Protocol Buffers";
                        path = proto;
                        sourceTree = "<group>";
                };
                                DC4D49D81F857728007AF2B8 /* CKKSSerializedKey.proto */,
                        );
                        name = "Protocol Buffers";
                        path = proto;
                        sourceTree = "<group>";
                };

-               DC9FD3251F858BAD00C8AAC8 /* derived source */ = {
+               DC9FD3251F858BAD00C8AAC8 /* generated */ = {

                        isa = PBXGroup;
                        children = (
                                DC9FD3271F858D3F00C8AAC8 /* CKKSSerializedKey.h */,
                                DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */,
                        );
                        isa = PBXGroup;
                        children = (
                                DC9FD3271F858D3F00C8AAC8 /* CKKSSerializedKey.h */,
                                DC9FD3261F858D3E00C8AAC8 /* CKKSSerializedKey.m */,
                        );

-                       name = "derived source";
-                       path = source;
-                       sourceTree = "<group>";
-               };
-               DCA4D2121E5651950056214F /* Tests (Live CloudKit) */ = {
-                       isa = PBXGroup;
-                       children = (
-                               6CB5F4781E402E5700DBF3F0 /* KeychainCKKS.plist */,
-                               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */,
-                               6CF4A0E11E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */,
-                               6CB5F4771E402D6D00DBF3F0 /* testrunner */,
-                               6CCDF7911E3C2D69003F2555 /* CKKSCloudKitTests.m */,
-                               6CB5F4751E4025AB00DBF3F0 /* CKKSCloudKitTestsInfo.plist */,
-                       );
-                       name = "Tests (Live CloudKit)";
-                       path = tests;
+                       name = generated;
+                       path = generated_source;

                        sourceTree = "<group>";
                };
                DCA4D2191E569FFE0056214F /* Helpers */ = {
                        sourceTree = "<group>";
                };
                DCA4D2191E569FFE0056214F /* Helpers */ = {


@@ -18545,6 +22386,8 @@
                                EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */,
                                DC207EB61ED4EAB600D46873 /* CKKSLockStateTracker.h */,
                                DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */,
                                EB4E0CD51FF36A1900CDCACC /* CKKSReachabilityTracker.m */,
                                DC207EB61ED4EAB600D46873 /* CKKSLockStateTracker.h */,
                                DC207EB71ED4EAB600D46873 /* CKKSLockStateTracker.m */,

+                               DC3412E5245780B9008ABD0A /* CKKSOperationDependencies.h */,
+                               DC3412E6245780BA008ABD0A /* CKKSOperationDependencies.m */,

                                DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */,
                                DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */,
                                DC1447881F5764C600236DB4 /* CKKSResultOperation.h */,
                                DCCD88E61E42622200F5AA71 /* CKKSGroupOperation.h */,
                                DCCD88E71E42622200F5AA71 /* CKKSGroupOperation.m */,
                                DC1447881F5764C600236DB4 /* CKKSResultOperation.h */,


@@ -18555,6 +22398,17 @@
                        name = Helpers;
                        sourceTree = "<group>";
                };
                        name = Helpers;
                        sourceTree = "<group>";
                };

+               DCA9D83A21FFDB7400B27421 /* tests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCAB17CB21FFF6C400E1DFCF /* MockSynchronousEscrowServer.h */,
+                               DCAB17CC21FFF6C400E1DFCF /* MockSynchronousEscrowServer.m */,
+                               DCA9D83B21FFDBA100B27421 /* SecEscrowRequestsTests-Info.plist */,
+                               DCBF4AE321FFC9A800539F0A /* SecEscrowRequestTests.m */,
+                       );
+                       path = tests;
+                       sourceTree = "<group>";
+               };

                DCAE1DCF2073FCA400B4F687 /* categories */ = {
                        isa = PBXGroup;
                        children = (
                DCAE1DCF2073FCA400B4F687 /* categories */ = {
                        isa = PBXGroup;
                        children = (


@@ -18567,6 +22421,7 @@
                DCB340651D8A24CC0054D16E /* authorization */ = {
                        isa = PBXGroup;
                        children = (
                DCB340651D8A24CC0054D16E /* authorization */ = {
                        isa = PBXGroup;
                        children = (

+                               F6D600702166551800F9F7C9 /* AuthorizationTrampolinePriv.h */,

                                DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */,
                                DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */,
                                DC17851C1D7789AF00B50D50 /* Authorization.h */,
                                DC17875D1D7790E500B50D50 /* AuthorizationPriv.h */,
                                DC17875E1D7790E500B50D50 /* AuthorizationTagsPriv.h */,
                                DC17851C1D7789AF00B50D50 /* Authorization.h */,


@@ -18810,8 +22665,6 @@
                                DCB341D41D8A2BAC0054D16E /* osxverifier.h */,
                                DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */,
                                DCB341D61D8A2BAC0054D16E /* u32handleobject.h */,
                                DCB341D41D8A2BAC0054D16E /* osxverifier.h */,
                                DCB341D51D8A2BAC0054D16E /* u32handleobject.cpp */,
                                DCB341D61D8A2BAC0054D16E /* u32handleobject.h */,

-                               DCB341D71D8A2BAC0054D16E /* uniformrandom.cpp */,
-                               DCB341D81D8A2BAC0054D16E /* uniformrandom.h */,

                                DCB341D91D8A2BAC0054D16E /* walkers.cpp */,
                                DCB341DA1D8A2BAC0054D16E /* walkers.h */,
                        );
                                DCB341D91D8A2BAC0054D16E /* walkers.cpp */,
                                DCB341DA1D8A2BAC0054D16E /* walkers.h */,
                        );


@@ -18834,7 +22687,6 @@
                                DCB344731D8A35270054D16E /* regressions */,
                                DCB342F81D8A32A20054D16E /* lib */,
                                DC1787281D77903700B50D50 /* SecAccessPriv.h */,
                                DCB344731D8A35270054D16E /* regressions */,
                                DCB342F81D8A32A20054D16E /* lib */,
                                DC1787281D77903700B50D50 /* SecAccessPriv.h */,

-                               DC1787291D77903700B50D50 /* SecCertificateBundle.h */,

                                DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */,
                                DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */,
                                DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */,
                                DC17872A1D77903700B50D50 /* SecFDERecoveryAsymmetricCrypto.h */,
                                DC17872B1D77903700B50D50 /* SecIdentitySearchPriv.h */,
                                DC17872C1D77903700B50D50 /* SecKeychainItemExtendedAttributes.h */,


@@ -18867,7 +22719,6 @@
                                DCB342441D8A32A20054D16E /* SecBase.cpp */,
                                DCB342451D8A32A20054D16E /* SecBridge.h */,
                                DCB342461D8A32A20054D16E /* SecCertificate.cpp */,
                                DCB342441D8A32A20054D16E /* SecBase.cpp */,
                                DCB342451D8A32A20054D16E /* SecBridge.h */,
                                DCB342461D8A32A20054D16E /* SecCertificate.cpp */,

-                               DCB342471D8A32A20054D16E /* SecCertificateBundle.cpp */,

                                DCB342491D8A32A20054D16E /* SecIdentity.cpp */,
                                DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */,
                                DCB3424B1D8A32A20054D16E /* SecItemConstants.c */,
                                DCB342491D8A32A20054D16E /* SecIdentity.cpp */,
                                DCB3424A1D8A32A20054D16E /* SecIdentitySearch.cpp */,
                                DCB3424B1D8A32A20054D16E /* SecItemConstants.c */,


@@ -18883,6 +22734,8 @@
                                DCB342551D8A32A20054D16E /* SecTrust.cpp */,
                                DCB342561D8A32A20054D16E /* SecTrustedApplication.cpp */,
                                DCB342571D8A32A20054D16E /* SecTrustSettings.cpp */,
                                DCB342551D8A32A20054D16E /* SecTrust.cpp */,
                                DCB342561D8A32A20054D16E /* SecTrustedApplication.cpp */,
                                DCB342571D8A32A20054D16E /* SecTrustSettings.cpp */,

+                               6C2D463924C88A700015C3C9 /* LegacyAPICounts.h */,
+                               6C2D463B24C88A870015C3C9 /* LegacyAPICounts.m */,

                        );
                        name = "API Bridge";
                        sourceTree = "<group>";
                        );
                        name = "API Bridge";
                        sourceTree = "<group>";


@@ -18925,7 +22778,6 @@
                                DCB342A51D8A32A20054D16E /* PolicyCursor.h */,
                                DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */,
                                DCB342A71D8A32A20054D16E /* SecCFTypes.h */,
                                DCB342A51D8A32A20054D16E /* PolicyCursor.h */,
                                DCB342A61D8A32A20054D16E /* SecCFTypes.cpp */,
                                DCB342A71D8A32A20054D16E /* SecCFTypes.h */,

-                               DCB342A81D8A32A20054D16E /* SecKeychainAddIToolsPassword.cpp */,

                                DCB342AA1D8A32A20054D16E /* StorageManager.cpp */,
                                DCB342AB1D8A32A20054D16E /* Trust.cpp */,
                                DCB342AC1D8A32A20054D16E /* Trust.h */,
                                DCB342AA1D8A32A20054D16E /* StorageManager.cpp */,
                                DCB342AB1D8A32A20054D16E /* Trust.cpp */,
                                DCB342AC1D8A32A20054D16E /* Trust.h */,


@@ -19087,6 +22939,88 @@
                        path = OSX/libsecurity_keychain;
                        sourceTree = "<group>";
                };
                        path = OSX/libsecurity_keychain;
                        sourceTree = "<group>";
                };

+               DCC0A4C52152C4AB000AF654 /* Pairing */ = {
+                       isa = PBXGroup;
+                       children = (
+                               0CADDF0421545C8E00DF8B06 /* OctagonPairingTests.swift */,
+                               0C6604812134DD5D00BFBBB8 /* OctagonPairingTests+ProximitySetup.swift */,
+                               0CBA047C214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift */,
+                               0CD5797721498F7700C43496 /* OctagonPairingTests+Piggybacking.swift */,
+                       );
+                       path = Pairing;
+                       sourceTree = "<group>";
+               };
+               DCC67E2A20DDC05900A70A31 /* Operations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1BB1CAB6232C05BC001D0C71 /* CuttlefishXPCWrapper.h */,
+                               1BB1CAB4232C05BB001D0C71 /* CuttlefishXPCWrapper.m */,
+                               DCE772642290712F005862B4 /* OctagonCheckTrustStateOperation.h */,
+                               DCE772652290712F005862B4 /* OctagonCheckTrustStateOperation.m */,
+                               0CA7020B2280D99D0085AC54 /* OTCheckHealthOperation.h */,
+                               0CA702082280D5600085AC54 /* OTCheckHealthOperation.m */,
+                               0CC8A9002123AA3B005D7F6A /* OTClientVoucherOperation.h */,
+                               0CC8A8FA2123A9EB005D7F6A /* OTClientVoucherOperation.m */,
+                               DC0D16042363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h */,
+                               DC0D16052363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m */,
+                               DCB946AD22FCB88400BE4490 /* OTDetermineHSA2AccountStatusOperation.h */,
+                               DCB946AE22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m */,
+                               0C87D3DA229326CB007853B5 /* OTEnsureOctagonKeyConsistency.h */,
+                               0C87D3D6229326A2007853B5 /* OTEnsureOctagonKeyConsistency.m */,
+                               0C64C07F2485A54100D84A5D /* OTPreloadOctagonKeysOperation.h */,
+                               0C64C07C2485A53000D84A5D /* OTPreloadOctagonKeysOperation.m */,
+                               0C4F4DE121153659007F7E20 /* OTEpochOperation.h */,
+                               0C4F4DDA211535E8007F7E20 /* OTEpochOperation.m */,
+                               0C66046E2134985100BFBBB8 /* OTEstablishOperation.h */,
+                               0C6604692134983900BFBBB8 /* OTEstablishOperation.m */,
+                               DCBFF830222611A200C5C044 /* OTFetchCKKSKeysOperation.h */,
+                               DCBFF831222611A200C5C044 /* OTFetchCKKSKeysOperation.m */,
+                               1B5EAAD92252ABCC008D27E7 /* OTFetchViewsOperation.h */,
+                               1B5EAADB2252ABCC008D27E7 /* OTFetchViewsOperation.m */,
+                               0CC8A9052123AF16005D7F6A /* OTJoinWithVoucherOperation.h */,
+                               0CC8A9012123AEF7005D7F6A /* OTJoinWithVoucherOperation.m */,
+                               DCF12671218A7579000124C6 /* OTLeaveCliqueOperation.h */,
+                               DCF12672218A757A000124C6 /* OTLeaveCliqueOperation.m */,
+                               DC7F79B822EA5C72001FB69A /* OTLocalCKKSResetOperation.h */,
+                               DC7F79B922EA5C72001FB69A /* OTLocalCKKSResetOperation.m */,
+                               0C00FC85217A972E00C8BF00 /* OTLocalCuttlefishReset.h */,
+                               0C00FC81217A971800C8BF00 /* OTLocalCuttlefishReset.m */,
+                               DC6E02122405DDC300C61335 /* OTModifyUserControllableViewStatusOperation.h */,
+                               DC6E02132405DDC400C61335 /* OTModifyUserControllableViewStatusOperation.m */,
+                               DC047085218BCEF20078BDAA /* OTOperationDependencies.h */,
+                               DC047086218BCEF20078BDAA /* OTOperationDependencies.m */,
+                               DCC67E2B20DDC07900A70A31 /* OTPrepareOperation.h */,
+                               DCC67E2C20DDC07900A70A31 /* OTPrepareOperation.m */,
+                               DC8757F2218D2003000E65F1 /* OTRemovePeersOperation.h */,
+                               DC8757F3218D2003000E65F1 /* OTRemovePeersOperation.m */,
+                               DC7250352296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h */,
+                               DC7250362296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m */,
+                               DCFF82722162876400D54B02 /* OTResetOperation.h */,
+                               DCFF82732162876400D54B02 /* OTResetOperation.m */,
+                               DC0D15FF2363A1D6007F0951 /* OTSetCDPBitOperation.h */,
+                               DC0D16002363A1D6007F0951 /* OTSetCDPBitOperation.m */,
+                               0CD3D518224047B400024755 /* OTSetRecoveryKeyOperation.h */,
+                               0CD3D5152240479600024755 /* OTSetRecoveryKeyOperation.m */,
+                               DC93F02722387A010072720A /* OTSOSUpdatePreapprovalsOperation.h */,
+                               DC93F02822387A010072720A /* OTSOSUpdatePreapprovalsOperation.m */,
+                               DC6DE897213076C000C6B56D /* OTSOSUpgradeOperation.h */,
+                               DC6DE898213076C000C6B56D /* OTSOSUpgradeOperation.m */,
+                               0CDD6F78226E62BC009094C2 /* OTTriggerEscrowUpdateOperation.h */,
+                               0CDD6F76226E62AD009094C2 /* OTTriggerEscrowUpdateOperation.m */,
+                               DC221BA92267E2A60068DBCF /* OTUpdateTPHOperation.h */,
+                               DC221BAA2267E2A60068DBCF /* OTUpdateTPHOperation.m */,
+                               DCF46C2C214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h */,
+                               DCF46C2D214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m */,
+                               DCC5417F225C05170095D926 /* OTUploadNewCKKSTLKsOperation.h */,
+                               DCC54180225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m */,
+                               0CB8DC962194B1300021A7C8 /* OTVouchWithBottleOperation.h */,
+                               0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */,
+                               0C1B8BB3223323710094D5DA /* OTVouchWithRecoveryKeyOperation.h */,
+                               0C1B8BB52233241E0094D5DA /* OTVouchWithRecoveryKeyOperation.m */,
+                       );
+                       name = Operations;
+                       sourceTree = "<group>";
+               };

                DCC78C7E1D8085D800865A7C /* Regressions */ = {
                        isa = PBXGroup;
                        children = (
                DCC78C7E1D8085D800865A7C /* Regressions */ = {
                        isa = PBXGroup;
                        children = (


@@ -19103,10 +23037,10 @@
                                DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */,
                                DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */,
                                DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */,
                                DCC78C411D8085D800865A7C /* secd-20-keychain_upgrade.m */,
                                DCC78C421D8085D800865A7C /* secd-21-transmogrify.m */,
                                DCC78C431D8085D800865A7C /* secd-30-keychain-upgrade.m */,

-                               DCC78C441D8085D800865A7C /* secd-31-keychain-bad.m */,

                                DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */,
                                DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */,
                                DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */,
                                DCC78C451D8085D800865A7C /* secd-31-keychain-unreadable.m */,
                                DCC78C461D8085D800865A7C /* secd-32-restore-bad-backup.m */,
                                DCC78C471D8085D800865A7C /* secd-33-keychain-ctk.m */,

+                               EB35153F211A79CB0097A87C /* secd-33-keychain-backup.m */,

                                DCC78C481D8085D800865A7C /* secd-34-backup-der-parse.m */,
                                DCC78C491D8085D800865A7C /* secd-35-keychain-migrate-inet.m */,
                                DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */,
                                DCC78C481D8085D800865A7C /* secd-34-backup-der-parse.m */,
                                DCC78C491D8085D800865A7C /* secd-35-keychain-migrate-inet.m */,
                                DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */,


@@ -19134,6 +23068,7 @@
                                DCC78C5F1D8085D800865A7C /* secd-64-circlereset.m */,
                                48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */,
                                483E79891DC875F2005C0008 /* secd-67-prefixedKeyIDs.m */,
                                DCC78C5F1D8085D800865A7C /* secd-64-circlereset.m */,
                                48CC58971DA5FF0B00EBD9DB /* secd-66-account-recovery.m */,
                                483E79891DC875F2005C0008 /* secd-67-prefixedKeyIDs.m */,

+                               487A65F3245B65F1005F51D6 /* secd-68-fullPeerInfoIntegrity.m */,

                                DCC78C601D8085D800865A7C /* secd-70-engine.m */,
                                DCC78C611D8085D800865A7C /* secd-70-engine-corrupt.m */,
                                DCC78C621D8085D800865A7C /* secd-70-engine-smash.m */,
                                DCC78C601D8085D800865A7C /* secd-70-engine.m */,
                                DCC78C611D8085D800865A7C /* secd-70-engine-corrupt.m */,
                                DCC78C621D8085D800865A7C /* secd-70-engine-smash.m */,


@@ -19151,7 +23086,6 @@
                                DCC78C701D8085D800865A7C /* secd-83-item-match-valid-on-date.m */,
                                DCC78C711D8085D800865A7C /* secd-83-item-match-trusted.m */,
                                DCC78C721D8085D800865A7C /* secd-83-item-match.h */,
                                DCC78C701D8085D800865A7C /* secd-83-item-match-valid-on-date.m */,
                                DCC78C711D8085D800865A7C /* secd-83-item-match-trusted.m */,
                                DCC78C721D8085D800865A7C /* secd-83-item-match.h */,

-                               DCC78C741D8085D800865A7C /* secd-95-escrow-persistence.m */,

                                DCC78C751D8085D800865A7C /* secd-100-initialsync.m */,
                                DCC78C761D8085D800865A7C /* secd-130-other-peer-views.m */,
                                DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */,
                                DCC78C751D8085D800865A7C /* secd-100-initialsync.m */,
                                DCC78C761D8085D800865A7C /* secd-130-other-peer-views.m */,
                                DCC78C771D8085D800865A7C /* secd-154-engine-backoff.m */,


@@ -19162,7 +23096,6 @@
                                DCDCC7DD1D9B54DF006487E8 /* secd-202-recoverykey.m */,
                                7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.m */,
                                522B28081E64B48E002B5638 /* secd-230-keybagtable.m */,
                                DCDCC7DD1D9B54DF006487E8 /* secd-202-recoverykey.m */,
                                7281E08E1DFD0D810021E1B7 /* secd-210-keyinterest.m */,
                                522B28081E64B48E002B5638 /* secd-230-keybagtable.m */,

-                               DCFAEDD11D9998DD005187E4 /* secd-668-ghosts.m */,

                                DCC78C791D8085D800865A7C /* SOSAccountTesting.h */,
                                DCC78C7A1D8085D800865A7C /* SecdTestKeychainUtilities.c */,
                                DCC78C7B1D8085D800865A7C /* SecdTestKeychainUtilities.h */,
                                DCC78C791D8085D800865A7C /* SOSAccountTesting.h */,
                                DCC78C7A1D8085D800865A7C /* SecdTestKeychainUtilities.c */,
                                DCC78C7B1D8085D800865A7C /* SecdTestKeychainUtilities.h */,


@@ -19183,6 +23116,8 @@
                                DC5AC2001D83653E00CF422C /* resources */,
                                DCC78C7E1D8085D800865A7C /* Regressions */,
                                DCC78C811D8085D800865A7C /* entitlements.plist */,
                                DC5AC2001D83653E00CF422C /* resources */,
                                DCC78C7E1D8085D800865A7C /* Regressions */,
                                DCC78C811D8085D800865A7C /* entitlements.plist */,

+                               6C4AEF82218A09210012C5DA /* CheckV12DevEnabled.h */,
+                               6C4AEF83218A09210012C5DA /* CheckV12DevEnabled.m */,

                                DCC78C8E1D8085D800865A7C /* SecDbItem.c */,
                                DCC78C8F1D8085D800865A7C /* SecDbItem.h */,
                                DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */,
                                DCC78C8E1D8085D800865A7C /* SecDbItem.c */,
                                DCC78C8F1D8085D800865A7C /* SecDbItem.h */,
                                DCC78C901D8085D800865A7C /* SecDbKeychainItem.m */,


@@ -19197,6 +23132,8 @@
                                DCC78C991D8085D800865A7C /* SecItemSchema.h */,
                                DCC78C9A1D8085D800865A7C /* SecItemServer.c */,
                                DCC78C9B1D8085D800865A7C /* SecItemServer.h */,
                                DCC78C991D8085D800865A7C /* SecItemSchema.h */,
                                DCC78C9A1D8085D800865A7C /* SecItemServer.c */,
                                DCC78C9B1D8085D800865A7C /* SecItemServer.h */,

+                               FC637229237B5CF800973738 /* SecItemServer+SWC.h */,
+                               FC63722A237B5CF900973738 /* SecItemServer+SWC.m */,

                                DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */,
                                DCC78C9D1D8085D800865A7C /* SecItemBackupServer.h */,
                                DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */,
                                DCC78C9C1D8085D800865A7C /* SecItemBackupServer.c */,
                                DCC78C9D1D8085D800865A7C /* SecItemBackupServer.h */,
                                DCC78C9E1D8085D800865A7C /* SecKeybagSupport.c */,


@@ -19212,8 +23149,8 @@
                                DCC78CB41D8085D800865A7C /* SecOTRRemote.m */,
                                DCC78CB51D8085D800865A7C /* SecOTRRemote.h */,
                                EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */,
                                DCC78CB41D8085D800865A7C /* SecOTRRemote.m */,
                                DCC78CB51D8085D800865A7C /* SecOTRRemote.h */,
                                EBC15B1B1DB4306C00126882 /* com.apple.secd.sb */,

-                               526965CB1E6E283100627F9D /* AsymKeybagBackup.h */,
-                               526965CC1E6E283100627F9D /* AsymKeybagBackup.m */,
+                               6C4AEF92218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.h */,
+                               6C4AEF93218A124B0012C5DA /* SecDbKeychainMetadataKeyStore.m */,

                                470ACEF21F58C3A600D1D5BD /* SecDbKeychainItemV7.h */,
                                470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */,
                                47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */,
                                470ACEF21F58C3A600D1D5BD /* SecDbKeychainItemV7.h */,
                                470ACEF31F58C3A600D1D5BD /* SecDbKeychainItemV7.m */,
                                47D1837D1FB1183D00CFCD89 /* SecDbKeychainV7-protobufs */,


@@ -19221,9 +23158,17 @@
                                47FF17251FD60ACA00875565 /* SFKeychainServer.m */,
                                473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */,
                                473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */,
                                47FF17251FD60ACA00875565 /* SFKeychainServer.m */,
                                473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */,
                                473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */,

+                               6C4AEF8A218A0A400012C5DA /* SecDbBackupManager.h */,
+                               6C9791C421C17D060074C609 /* SecDbBackupManager_Internal.h */,
+                               6C4AEF8B218A0A400012C5DA /* SecDbBackupManager.m */,
+                               6CB6CBFE2198D40B0080AD6F /* SecDbBackupManager-protobufs */,
+                               6C4AEF9C218A16F80012C5DA /* SecAKSObjCWrappers.h */,
+                               6C4AEF9D218A16F80012C5DA /* SecAKSObjCWrappers.m */,
+                               1B995256226681ED00A2D6CD /* PolicyReporter.h */,
+                               1B995258226681EE00A2D6CD /* PolicyReporter.m */,

                        );
                        name = "securityd iOS";
                        );
                        name = "securityd iOS";

-                       path = OSX/sec/securityd;
+                       path = keychain/securityd;

                        sourceTree = "<group>";
                };
                DCC78CFC1D8085F200865A7C /* CKBridge */ = {
                        sourceTree = "<group>";
                };
                DCC78CFC1D8085F200865A7C /* CKBridge */ = {


@@ -19248,7 +23193,6 @@
                                DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */,
                                DCC78D031D8085F200865A7C /* sc-45-digestvector.c */,
                                DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */,
                                DCC78D021D8085F200865A7C /* sc-42-circlegencount.c */,
                                DCC78D031D8085F200865A7C /* sc-45-digestvector.c */,
                                DCC78D041D8085F200865A7C /* sc-130-resignationticket.c */,

-                               DCC78D061D8085F200865A7C /* sc-150-ring.m */,

                                DCC78D071D8085F200865A7C /* sc-150-backupkeyderivation.c */,
                                DCC78D081D8085F200865A7C /* sc-153-backupslicekeybag.c */,
                                DCC78D091D8085F200865A7C /* SOSCircle_regressions.h */,
                                DCC78D071D8085F200865A7C /* sc-150-backupkeyderivation.c */,
                                DCC78D081D8085F200865A7C /* sc-153-backupslicekeybag.c */,
                                DCC78D091D8085F200865A7C /* SOSCircle_regressions.h */,


@@ -19295,12 +23239,12 @@
                                DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */,
                                48776C731DA5BB4200CC09B9 /* SOSRecoveryKeyBag.m */,
                                48776C741DA5BB4200CC09B9 /* SOSRecoveryKeyBag.h */,
                                DCC78D2A1D8085F200865A7C /* SOSBackupSliceKeyBag.h */,
                                48776C731DA5BB4200CC09B9 /* SOSRecoveryKeyBag.m */,
                                48776C741DA5BB4200CC09B9 /* SOSRecoveryKeyBag.h */,

-                               48E6171A1DBEC40D0098EAAD /* SOSBackupInformation.m */,
-                               48E6171B1DBEC40D0098EAAD /* SOSBackupInformation.h */,

                                DCC78D2B1D8085F200865A7C /* SOSUserKeygen.m */,
                                DCC78D2C1D8085F200865A7C /* SOSUserKeygen.h */,
                                485B64081DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.c */,
                                485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */,
                                DCC78D2B1D8085F200865A7C /* SOSUserKeygen.m */,
                                DCC78D2C1D8085F200865A7C /* SOSUserKeygen.h */,
                                485B64081DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.c */,
                                485B64091DC16E8300B771B9 /* SOSKeyedPubKeyIdentifier.h */,

+                               48AC7B5C232B1A1700F02B6F /* SOSIntervalEvent.h */,
+                               48AC7B71232B1A7000F02B6F /* SOSIntervalEvent.m */,

                                DCC78D111D8085F200865A7C /* SOSExports.exp-in */,
                        );
                        name = Account;
                                DCC78D111D8085F200865A7C /* SOSExports.exp-in */,
                        );
                        name = Account;


@@ -19430,6 +23374,7 @@
                DCC78D911D8085F200865A7C /* SecureObjectSync */ = {
                        isa = PBXGroup;
                        children = (
                DCC78D911D8085F200865A7C /* SecureObjectSync */ = {
                        isa = PBXGroup;
                        children = (

+                               EB0E1B902358FA4B002B6037 /* generated_source */,

                                CD1D64461DD386C9006D4139 /* AccountTrust */,
                                DCC78D2D1D8085F200865A7C /* Account */,
                                DCC78D4E1D8085F200865A7C /* Circle */,
                                CD1D64461DD386C9006D4139 /* AccountTrust */,
                                DCC78D2D1D8085F200865A7C /* Account */,
                                DCC78D4E1D8085F200865A7C /* Circle */,


@@ -19441,8 +23386,6 @@
                                DCC78D891D8085F200865A7C /* SOSCloudCircle.m */,
                                DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */,
                                DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */,
                                DCC78D891D8085F200865A7C /* SOSCloudCircle.m */,
                                DCC78D8A1D8085F200865A7C /* SOSCloudCircle.h */,
                                DCC78D8B1D8085F200865A7C /* SOSCloudCircleInternal.h */,

-                               DCB332371F46804000178C30 /* SOSSysdiagnose.h */,
-                               DCC78D8C1D8085F200865A7C /* SOSSysdiagnose.m */,

                                DCC78D8D1D8085F200865A7C /* SOSInternal.m */,
                                DCC78D8E1D8085F200865A7C /* SOSInternal.h */,
                                DCC78D8F1D8085F200865A7C /* SOSTypes.h */,
                                DCC78D8D1D8085F200865A7C /* SOSInternal.m */,
                                DCC78D8E1D8085F200865A7C /* SOSInternal.h */,
                                DCC78D8F1D8085F200865A7C /* SOSTypes.h */,


@@ -19451,11 +23394,18 @@
                                EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */,
                                DAB27ADA1FA29EB700DEBBDE /* SOSControlServer.h */,
                                DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */,
                                EBEEEE361EA31A8300E15F5C /* SOSControlHelper.m */,
                                DAB27ADA1FA29EB700DEBBDE /* SOSControlServer.h */,
                                DAB27AE01FA29EB800DEBBDE /* SOSControlServer.m */,

+                               DCC78CFC1D8085F200865A7C /* CKBridge */,
+                               DCC78D101D8085F200865A7C /* Regressions */,
+                               DCC78DA01D8085F200865A7C /* Tool */,

                                48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */,
                                48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */,
                                48FE669520E6E69C00FAEF17 /* SOSAuthKitHelpers.h */,
                                48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */,

+                               480C03D621459CD70034570E /* SOSTrustedDeviceAttributes.h */,
+                               480C03D321459CD60034570E /* SOSTrustedDeviceAttributes.m */,
+                               EB0E1AC72352A81E002B6037 /* SOSAccountConfiguration.proto */,

                        );
                        );

-                       path = SecureObjectSync;
-                       sourceTree = "<group>";
+                       name = SecureObjectSync;
+                       path = keychain/SecureObjectSync;
+                       sourceTree = SOURCE_ROOT;

                };
                DCC78DA01D8085F200865A7C /* Tool */ = {
                        isa = PBXGroup;
                };
                DCC78DA01D8085F200865A7C /* Tool */ = {
                        isa = PBXGroup;


@@ -19470,8 +23420,6 @@
                                DCC78D9B1D8085F200865A7C /* keychain_log.m */,
                                0C0CEC9D1DA45EA200C22FBC /* recovery_key.h */,
                                0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */,
                                DCC78D9B1D8085F200865A7C /* keychain_log.m */,
                                0C0CEC9D1DA45EA200C22FBC /* recovery_key.h */,
                                0C0CEC9E1DA45EA200C22FBC /* recovery_key.m */,

-                               DCC78D9D1D8085F200865A7C /* syncbackup.m */,
-                               DCC78D9C1D8085F200865A7C /* syncbackup.h */,

                                DCC78D9E1D8085F200865A7C /* secViewDisplay.c */,
                                DCC78D9F1D8085F200865A7C /* secViewDisplay.h */,
                                48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */,
                                DCC78D9E1D8085F200865A7C /* secViewDisplay.c */,
                                DCC78D9F1D8085F200865A7C /* secViewDisplay.h */,
                                48C2F9321E4BCFC30093D70C /* accountCirclesViewsPrint.m */,


@@ -19480,18 +23428,6 @@
                        path = Tool;
                        sourceTree = "<group>";
                };
                        path = Tool;
                        sourceTree = "<group>";
                };

-               DCC78DA11D8085F200865A7C /* SOSCircle */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCC78CFC1D8085F200865A7C /* CKBridge */,
-                               DCC78D101D8085F200865A7C /* Regressions */,
-                               DCC78D911D8085F200865A7C /* SecureObjectSync */,
-                               DCC78DA01D8085F200865A7C /* Tool */,
-                       );
-                       name = SOSCircle;
-                       path = OSX/sec/SOSCircle;
-                       sourceTree = "<group>";
-               };

                DCC78DA61D8085FC00865A7C /* crypto */ = {
                        isa = PBXGroup;
                        children = (
                DCC78DA61D8085FC00865A7C /* crypto */ = {
                        isa = PBXGroup;
                        children = (


@@ -19550,23 +23486,6 @@
                        path = "si-66-smime";
                        sourceTree = "<group>";
                };
                        path = "si-66-smime";
                        sourceTree = "<group>";
                };

-               DCC78DF61D8085FC00865A7C /* si-67-sectrust-blocklist */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCC78DEC1D8085FC00865A7C /* Global Trustee.cer.h */,
-                               DCC78DED1D8085FC00865A7C /* UTN-USERFirst-Hardware.cer.h */,
-                               DCC78DEE1D8085FC00865A7C /* addons.mozilla.org.cer.h */,
-                               DCC78DEF1D8085FC00865A7C /* login.live.com.cer.h */,
-                               DCC78DF01D8085FC00865A7C /* login.skype.com.cer.h */,
-                               DCC78DF11D8085FC00865A7C /* login.yahoo.com.1.cer.h */,
-                               DCC78DF21D8085FC00865A7C /* login.yahoo.com.2.cer.h */,
-                               DCC78DF31D8085FC00865A7C /* login.yahoo.com.cer.h */,
-                               DCC78DF41D8085FC00865A7C /* mail.google.com.cer.h */,
-                               DCC78DF51D8085FC00865A7C /* www.google.com.cer.h */,
-                       );
-                       path = "si-67-sectrust-blocklist";
-                       sourceTree = "<group>";
-               };

                DCC78E121D8085FC00865A7C /* secitem */ = {
                        isa = PBXGroup;
                        children = (
                DCC78E121D8085FC00865A7C /* secitem */ = {
                        isa = PBXGroup;
                        children = (


@@ -19578,31 +23497,19 @@
                                DCC78DB41D8085FC00865A7C /* si-13-item-system.m */,
                                DCC78DB51D8085FC00865A7C /* si-14-dateparse.c */,
                                DCC78DB61D8085FC00865A7C /* si-15-delete-access-group.m */,
                                DCC78DB41D8085FC00865A7C /* si-13-item-system.m */,
                                DCC78DB51D8085FC00865A7C /* si-14-dateparse.c */,
                                DCC78DB61D8085FC00865A7C /* si-15-delete-access-group.m */,

-                               DCC78DB71D8085FC00865A7C /* si-15-certificate.c */,
-                               DCC78DB81D8085FC00865A7C /* si-16-ec-certificate.c */,

                                DCC78DB91D8085FC00865A7C /* si-17-item-system-bluetooth.m */,
                                DCC78DB91D8085FC00865A7C /* si-17-item-system-bluetooth.m */,

-                               D4AA647C1E97144700D317ED /* si-18-certificate-parse.m */,
-                               DCC78DBA1D8085FC00865A7C /* si-20-sectrust-policies.m */,
-                               DCC78DBB1D8085FC00865A7C /* si-20-sectrust.c */,
-                               DCC78DBC1D8085FC00865A7C /* si-20-sectrust.h */,

                                DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */,
                                DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */,
                                DCC78DBF1D8085FC00865A7C /* si-22-sectrust-iap.h */,
                                DCC78DBD1D8085FC00865A7C /* si-21-sectrust-asr.c */,
                                DCC78DBE1D8085FC00865A7C /* si-22-sectrust-iap.c */,
                                DCC78DBF1D8085FC00865A7C /* si-22-sectrust-iap.h */,

-                               DCC78DC01D8085FC00865A7C /* si-23-sectrust-ocsp.c */,
-                               D46513072097954B005D93FE /* si-23-sectrust-ocsp.h */,

                                DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */,
                                DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */,
                                DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */,
                                DCC78DC11D8085FC00865A7C /* si-24-sectrust-digicert-malaysia.c */,
                                DCC78DC21D8085FC00865A7C /* si-24-sectrust-diginotar.c */,
                                DCC78DC31D8085FC00865A7C /* si-24-sectrust-itms.c */,

-                               DCC78DC41D8085FC00865A7C /* si-24-sectrust-nist.c */,

                                DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */,
                                DC0B62261D90973900D43BCB /* si-25-cms-skid.h */,
                                DC0B62271D90973900D43BCB /* si-25-cms-skid.m */,
                                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */,
                                DCC78DC51D8085FC00865A7C /* si-24-sectrust-passbook.c */,
                                DC0B62261D90973900D43BCB /* si-25-cms-skid.h */,
                                DC0B62271D90973900D43BCB /* si-25-cms-skid.m */,
                                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */,

-                               DCC78DC71D8085FC00865A7C /* si-27-sectrust-exceptions.c */,
-                               DCC78DC81D8085FC00865A7C /* si-28-sectrustsettings.m */,
-                               DCC78DC91D8085FC00865A7C /* si-28-sectrustsettings.h */,
-                               D487FBB71DB8357300D4BB0B /* si-29-sectrust-sha1-deprecation.m */,
-                               D487FBB91DB835B500D4BB0B /* si-29-sectrust-sha1-deprecation.h */,
+                               D4AA0D9922FB959600D77FA4 /* si-29-cms-chain-mode.m */,
+                               D4AA0D9C22FB962300D77FA4 /* si-29-cms-chain-mode.h */,

                                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */,
                                DCC78DCB1D8085FC00865A7C /* si-31-keychain-bad.c */,
                                DCC78DCC1D8085FC00865A7C /* si-31-keychain-unreadable.c */,
                                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */,
                                DCC78DCB1D8085FC00865A7C /* si-31-keychain-bad.c */,
                                DCC78DCC1D8085FC00865A7C /* si-31-keychain-unreadable.c */,


@@ -19623,8 +23530,8 @@
                                DCC78DD51D8085FC00865A7C /* si-44-seckey-ec.m */,
                                DCC78DD61D8085FC00865A7C /* si-44-seckey-ies.m */,
                                5E77936E1E5EFEB20074A2D1 /* si-44-seckey-aks.m */,
                                DCC78DD51D8085FC00865A7C /* si-44-seckey-ec.m */,
                                DCC78DD61D8085FC00865A7C /* si-44-seckey-ies.m */,
                                5E77936E1E5EFEB20074A2D1 /* si-44-seckey-aks.m */,

-                               09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */,

                                09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */,
                                09A3B9DF1F8271A200C5C324 /* si-44-seckey-proxy.m */,

+                               09CB496A1F2F64AF00C8E4DE /* si-44-seckey-fv.m */,

                                DCC78DD71D8085FC00865A7C /* si-50-secrandom.c */,
                                DCC78DD81D8085FC00865A7C /* si-60-cms.c */,
                                DCC78DD91D8085FC00865A7C /* si-61-pkcs12.c */,
                                DCC78DD71D8085FC00865A7C /* si-50-secrandom.c */,
                                DCC78DD81D8085FC00865A7C /* si-60-cms.c */,
                                DCC78DD91D8085FC00865A7C /* si-61-pkcs12.c */,


@@ -19638,36 +23545,22 @@
                                DCC78DE81D8085FC00865A7C /* si-65-cms-cert-policy.c */,
                                DCC78DEA1D8085FC00865A7C /* si-66-smime */,
                                DCC78DEB1D8085FC00865A7C /* si-66-smime.c */,
                                DCC78DE81D8085FC00865A7C /* si-65-cms-cert-policy.c */,
                                DCC78DEA1D8085FC00865A7C /* si-66-smime */,
                                DCC78DEB1D8085FC00865A7C /* si-66-smime.c */,

-                               DCC78DF61D8085FC00865A7C /* si-67-sectrust-blocklist */,
-                               DCC78DF71D8085FC00865A7C /* si-67-sectrust-blocklist.c */,

                                DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */,
                                DCC78DF91D8085FC00865A7C /* si-69-keydesc.c */,
                                DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */,
                                DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */,
                                DCC78DFC1D8085FC00865A7C /* si-72-syncableitems.c */,
                                DCC78DFD1D8085FC00865A7C /* si-73-secpasswordgenerate.c */,
                                DCC78DF81D8085FC00865A7C /* si-68-secmatchissuer.c */,
                                DCC78DF91D8085FC00865A7C /* si-69-keydesc.c */,
                                DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */,
                                DCC78DFB1D8085FC00865A7C /* si-71-mobile-store-policy.c */,
                                DCC78DFC1D8085FC00865A7C /* si-72-syncableitems.c */,
                                DCC78DFD1D8085FC00865A7C /* si-73-secpasswordgenerate.c */,

-                               DCC78DFE1D8085FC00865A7C /* si-74-OTAPKISigner.c */,

                                DCC78DFF1D8085FC00865A7C /* si-76-shared-credentials.c */,
                                DCC78E001D8085FC00865A7C /* si_77_SecAccessControl.c */,
                                DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */,
                                DCC78E021D8085FC00865A7C /* si-80-empty-data.c */,
                                DCC78DFF1D8085FC00865A7C /* si-76-shared-credentials.c */,
                                DCC78E001D8085FC00865A7C /* si_77_SecAccessControl.c */,
                                DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */,
                                DCC78E021D8085FC00865A7C /* si-80-empty-data.c */,

-                               DCC78E031D8085FC00865A7C /* si-82-seccertificate-ct.c */,
-                               DCC78E041D8085FC00865A7C /* si-82-sectrust-ct.m */,
-                               D46A6BF121531F77008ABF6A /* si-82-sectrust-ct.h */,

                                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */,
                                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */,
                                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */,
                                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */,

-                               BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */,
-                               DCC78E071D8085FC00865A7C /* si-85-sectrust-ssl-policy.c */,
-                               DCC78E081D8085FC00865A7C /* si-85-sectrust-ssl-policy.h */,
-                               DCC78E091D8085FC00865A7C /* si-87-sectrust-name-constraints.m */,
-                               DCC78E0A1D8085FC00865A7C /* si-87-sectrust-name-constraints.h */,
-                               BEB9E9E51FFF193D00676593 /* si-88-sectrust-valid.m */,

                                DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */,
                                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */,
                                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */,
                                DCC78E0F1D8085FC00865A7C /* si-95-cms-basic.h */,
                                DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */,
                                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */,
                                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */,
                                DCC78E0F1D8085FC00865A7C /* si-95-cms-basic.h */,

-                               DCC78E101D8085FC00865A7C /* si-97-sectrust-path-scoring.m */,
-                               DCC78E111D8085FC00865A7C /* si-97-sectrust-path-scoring.h */,

                                DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */,
                                DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */,
                                DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */,
                                DCD45353209A5B260086CBFC /* si-cms-signing-identity-p12.h */,
                                DCD45354209A5B260086CBFC /* si-cms-signing-identity-p12.c */,
                                DCE2341520A3D4B8009766A3 /* si-cms-hash-agility-data.h */,


@@ -19703,29 +23596,6 @@
                        name = Regressions;
                        sourceTree = "<group>";
                };
                        name = Regressions;
                        sourceTree = "<group>";
                };

-               DCC78E271D8085FC00865A7C /* Security/Tool */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCC78E191D8085FC00865A7C /* verify_cert.c */,
-                               DCC78E1A1D8085FC00865A7C /* keychain_util.c */,
-                               DCC78E1B1D8085FC00865A7C /* keychain_util.h */,
-                               DCC78E1C1D8085FC00865A7C /* add_internet_password.c */,
-                               DCC78E1D1D8085FC00865A7C /* log_control.c */,
-                               DCC78E1E1D8085FC00865A7C /* codesign.c */,
-                               DCC78E1F1D8085FC00865A7C /* keychain_add.c */,
-                               DCC78E201D8085FC00865A7C /* keychain_find.m */,
-                               DCC78E221D8085FC00865A7C /* pkcs12_util.c */,
-                               DCC78E231D8085FC00865A7C /* scep.c */,
-                               DCC78E241D8085FC00865A7C /* SecurityCommands.h */,
-                               DCC78E251D8085FC00865A7C /* show_certificates.c */,
-                               D453C38A1FEC669300DE349B /* trust_update.m */,
-                               DCC78E261D8085FC00865A7C /* spc.c */,
-                               D484A1012167D6F8008653A9 /* ct_exceptions.m */,
-                       );
-                       name = Security/Tool;
-                       path = OSX/sec/Security/Tool;
-                       sourceTree = "<group>";
-               };

                DCC78E9E1D8085FC00865A7C /* Security.framework iOS */ = {
                        isa = PBXGroup;
                        children = (
                DCC78E9E1D8085FC00865A7C /* Security.framework iOS */ = {
                        isa = PBXGroup;
                        children = (


@@ -19735,7 +23605,7 @@
                                7908507E0CA87CF00083CC4D /* ipc */,
                                DCC78E181D8085FC00865A7C /* Regressions */,
                                4C198F1A0ACDB4BF00AAB142 /* strings */,
                                7908507E0CA87CF00083CC4D /* ipc */,
                                DCC78E181D8085FC00865A7C /* Regressions */,
                                4C198F1A0ACDB4BF00AAB142 /* strings */,

-                               79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */,
+                               D4CF6E62211588140014647E /* cms */,

                                DCC78E321D8085FC00865A7C /* SecAccessControlExports.exp-in */,
                                DCC78E4E1D8085FC00865A7C /* SecExports.exp-in */,
                                DCD7EE9B1F4F51D9007D9804 /* ios_tapi_hacks.h */,
                                DCC78E321D8085FC00865A7C /* SecAccessControlExports.exp-in */,
                                DCC78E4E1D8085FC00865A7C /* SecExports.exp-in */,
                                DCD7EE9B1F4F51D9007D9804 /* ios_tapi_hacks.h */,


@@ -19896,8 +23766,6 @@
                                DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */,
                                DCD067CB1D8CDF7E007602F1 /* csprocess.h */,
                                DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */,
                                DCD067CA1D8CDF7E007602F1 /* cskernel.cpp */,
                                DCD067CB1D8CDF7E007602F1 /* csprocess.h */,
                                DCD067CC1D8CDF7E007602F1 /* csprocess.cpp */,

-                               DCD067CD1D8CDF7E007602F1 /* csgeneric.h */,
-                               DCD067CE1D8CDF7E007602F1 /* csgeneric.cpp */,

                        );
                        name = "Code Classes";
                        sourceTree = "<group>";
                        );
                        name = "Code Classes";
                        sourceTree = "<group>";


@@ -19930,15 +23798,6 @@
                        sourceTree = "<group>";
                        usesTabs = 1;
                };
                        sourceTree = "<group>";
                        usesTabs = 1;
                };

-               DCD067E91D8CDF7E007602F1 /* Static Support */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCD067E71D8CDF7E007602F1 /* SecCodeHostLib.h */,
-                               DCD067E81D8CDF7E007602F1 /* SecCodeHostLib.c */,
-                       );
-                       name = "Static Support";
-                       sourceTree = "<group>";
-               };

                DCD067ED1D8CDF7E007602F1 /* DTrace */ = {
                        isa = PBXGroup;
                        children = (
                DCD067ED1D8CDF7E007602F1 /* DTrace */ = {
                        isa = PBXGroup;
                        children = (


@@ -19970,6 +23829,8 @@
                                DCD067FD1D8CDF7E007602F1 /* dirscanner.cpp */,
                                A6B1BA78207BD9D400F1E099 /* notarization.cpp */,
                                A6B1BA79207BD9D400F1E099 /* notarization.h */,
                                DCD067FD1D8CDF7E007602F1 /* dirscanner.cpp */,
                                A6B1BA78207BD9D400F1E099 /* notarization.cpp */,
                                A6B1BA79207BD9D400F1E099 /* notarization.h */,

+                               1F631C5122387F27005920D8 /* legacydevid.cpp */,
+                               1F631C5222387F27005920D8 /* legacydevid.h */,

                        );
                        name = "Local Utilities";
                        sourceTree = "<group>";
                        );
                        name = "Local Utilities";
                        sourceTree = "<group>";


@@ -20021,7 +23882,6 @@
                                DCD067C81D8CDF7E007602F1 /* Requirements */,
                                DCD067CF1D8CDF7E007602F1 /* Code Classes */,
                                DCD067E41D8CDF7E007602F1 /* Disk Representations */,
                                DCD067C81D8CDF7E007602F1 /* Requirements */,
                                DCD067CF1D8CDF7E007602F1 /* Code Classes */,
                                DCD067E41D8CDF7E007602F1 /* Disk Representations */,

-                               DCD067E91D8CDF7E007602F1 /* Static Support */,

                                DCD067ED1D8CDF7E007602F1 /* DTrace */,
                                DCD067FE1D8CDF7E007602F1 /* Local Utilities */,
                                DCD068011D8CDF7E007602F1 /* Security Plugins */,
                                DCD067ED1D8CDF7E007602F1 /* DTrace */,
                                DCD067FE1D8CDF7E007602F1 /* Local Utilities */,
                                DCD068011D8CDF7E007602F1 /* Security Plugins */,


@@ -20198,8 +24058,6 @@
                                DCD06B061D8E0D7D007602F1 /* unix++.cpp */,
                                DCD06B071D8E0D7D007602F1 /* unixchild.h */,
                                DCD06B081D8E0D7D007602F1 /* unixchild.cpp */,
                                DCD06B061D8E0D7D007602F1 /* unix++.cpp */,
                                DCD06B071D8E0D7D007602F1 /* unixchild.h */,
                                DCD06B081D8E0D7D007602F1 /* unixchild.cpp */,

-                               DCD06B091D8E0D7D007602F1 /* vproc++.h */,
-                               DCD06B0A1D8E0D7D007602F1 /* vproc++.cpp */,

                        );
                        name = Unix;
                        sourceTree = "<group>";
                        );
                        name = Unix;
                        sourceTree = "<group>";


@@ -20207,10 +24065,9 @@
                DCD06B1B1D8E0D7D007602F1 /* Mach */ = {
                        isa = PBXGroup;
                        children = (
                DCD06B1B1D8E0D7D007602F1 /* Mach */ = {
                        isa = PBXGroup;
                        children = (

+                               DA2C402D2189302E005F1CC3 /* mach_notify.defs */,

                                DCD06B0C1D8E0D7D007602F1 /* mach++.h */,
                                DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */,
                                DCD06B0C1D8E0D7D007602F1 /* mach++.h */,
                                DCD06B0D1D8E0D7D007602F1 /* mach++.cpp */,

-                               DCD06B0E1D8E0D7D007602F1 /* mach_notify.h */,
-                               DCD06B0F1D8E0D7D007602F1 /* mach_notify.c */,

                                DCD06B101D8E0D7D007602F1 /* cfmach++.h */,
                                DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */,
                                DCD06B121D8E0D7D007602F1 /* macho++.h */,
                                DCD06B101D8E0D7D007602F1 /* cfmach++.h */,
                                DCD06B111D8E0D7D007602F1 /* cfmach++.cpp */,
                                DCD06B121D8E0D7D007602F1 /* macho++.h */,


@@ -20220,8 +24077,6 @@
                                DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */,
                                DCD06B171D8E0D7D007602F1 /* machserver.h */,
                                DCD06B181D8E0D7D007602F1 /* machserver.cpp */,
                                DCD06B161D8E0D7D007602F1 /* dyld_cache_format.h */,
                                DCD06B171D8E0D7D007602F1 /* machserver.h */,
                                DCD06B181D8E0D7D007602F1 /* machserver.cpp */,

-                               DCD06B191D8E0D7D007602F1 /* machrunloopserver.h */,
-                               DCD06B1A1D8E0D7D007602F1 /* machrunloopserver.cpp */,

                        );
                        name = Mach;
                        sourceTree = "<group>";
                        );
                        name = Mach;
                        sourceTree = "<group>";


@@ -20264,8 +24119,6 @@
                                DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */,
                                DCD06AC41D8E0D7D007602F1 /* debugsupport.h */,
                                DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */,
                                DCD06AC31D8E0D7D007602F1 /* debugging_internal.h */,
                                DCD06AC41D8E0D7D007602F1 /* debugsupport.h */,
                                DCD06AC51D8E0D7D007602F1 /* debugging_internal.cpp */,

-                               DCD06AC61D8E0D7D007602F1 /* devrandom.h */,
-                               DCD06AC71D8E0D7D007602F1 /* devrandom.cpp */,

                                DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */,
                                DCD06AC91D8E0D7D007602F1 /* dispatch.h */,
                                DCD06ACA1D8E0D7D007602F1 /* endian.h */,
                                DCD06AC81D8E0D7D007602F1 /* dispatch.cpp */,
                                DCD06AC91D8E0D7D007602F1 /* dispatch.h */,
                                DCD06ACA1D8E0D7D007602F1 /* endian.h */,


@@ -20292,8 +24145,6 @@
                                DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */,
                                DCD06AE31D8E0D7D007602F1 /* sqlite++.h */,
                                DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */,
                                DCD06AE21D8E0D7D007602F1 /* simpleprefs.cpp */,
                                DCD06AE31D8E0D7D007602F1 /* sqlite++.h */,
                                DCD06AE41D8E0D7D007602F1 /* sqlite++.cpp */,

-                               DCD06AE51D8E0D7D007602F1 /* streams.h */,
-                               DCD06AE61D8E0D7D007602F1 /* streams.cpp */,

                                DCD06AE71D8E0D7D007602F1 /* superblob.h */,
                                DCD06AE81D8E0D7D007602F1 /* superblob.cpp */,
                                DCD06AE91D8E0D7D007602F1 /* threading.h */,
                                DCD06AE71D8E0D7D007602F1 /* superblob.h */,
                                DCD06AE81D8E0D7D007602F1 /* superblob.cpp */,
                                DCD06AE91D8E0D7D007602F1 /* threading.h */,


@@ -20335,6 +24186,34 @@
                        path = OSX/libsecurity_utilities;
                        sourceTree = "<group>";
                };
                        path = OSX/libsecurity_utilities;
                        sourceTree = "<group>";
                };

+               DCD33D7D220B9D98000A390B /* State Machine Machinery */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DC0FA6AE2291F63F00FE01C4 /* OctagonPendingFlag.h */,
+                               DC0FA6AF2291F63F00FE01C4 /* OctagonPendingFlag.m */,
+                               DC5681A8224DA05F008F8DEB /* OctagonFlags.h */,
+                               DC5681A9224DA05F008F8DEB /* OctagonFlags.m */,
+                               DCFC91AD21F16E0B00E674DD /* OctagonStateMachine.h */,
+                               DCFC91AE21F16E0B00E674DD /* OctagonStateMachine.m */,
+                               DCD33D7E220B9DC8000A390B /* OctagonStateMachineHelpers.h */,
+                               DCD33D7F220B9DC8000A390B /* OctagonStateMachineHelpers.m */,
+                               DC45D43B22EB619D00CEB6B7 /* OctagonStateMachineObservers.h */,
+                               DC45D43C22EB619D00CEB6B7 /* OctagonStateMachineObservers.m */,
+                       );
+                       name = "State Machine Machinery";
+                       sourceTree = "<group>";
+               };
+               DCD33D95220CFF93000A390B /* operations */ = {
+                       isa = PBXGroup;
+                       children = (
+                               DCD33D91220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.h */,
+                               DCD33D92220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m */,
+                               DCD33D8C220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.h */,
+                               DCD33D8D220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.m */,
+                       );
+                       path = operations;
+                       sourceTree = "<group>";
+               };

                DCD662EB1E32946000188186 /* Sync Objects */ = {
                        isa = PBXGroup;
                        children = (
                DCD662EB1E32946000188186 /* Sync Objects */ = {
                        isa = PBXGroup;
                        children = (


@@ -20357,8 +24236,12 @@
                                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */,
                                DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */,
                                DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */,
                                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */,
                                DCE278DB1ED789EF0083B485 /* CKKSCurrentItemPointer.h */,
                                DCE278DC1ED789EF0083B485 /* CKKSCurrentItemPointer.m */,

-                               DC7341F11F8447AB00AB9BDF /* CKKSTLKShare.h */,
-                               DC7341F21F8447AB00AB9BDF /* CKKSTLKShare.m */,
+                               DC7341F11F8447AB00AB9BDF /* CKKSTLKShareRecord.h */,
+                               DC7341F21F8447AB00AB9BDF /* CKKSTLKShareRecord.m */,
+                               DC5A01E621BB428500D87AB9 /* CKKSTLKShare.h */,
+                               DC5A01E721BB428500D87AB9 /* CKKSTLKShare.m */,
+                               DC0BD4EF21BB05F2006B9154 /* CKKSKeychainBackedKey.h */,
+                               DC0BD4F021BB05F2006B9154 /* CKKSKeychainBackedKey.m */,

                        );
                        name = "Sync Objects";
                        sourceTree = "<group>";
                        );
                        name = "Sync Objects";
                        sourceTree = "<group>";


@@ -20367,6 +24250,12 @@
                        isa = PBXGroup;
                        children = (
                                DCA4D2191E569FFE0056214F /* Helpers */,
                        isa = PBXGroup;
                        children = (
                                DCA4D2191E569FFE0056214F /* Helpers */,

+                               DC947E812463831E005B8669 /* CKKSCheckKeyHierarchyOperation.h */,
+                               DC947E832463831F005B8669 /* CKKSCheckKeyHierarchyOperation.m */,
+                               DCB5516A247F3DB50009A859 /* CKKSCreateCKZoneOperation.h */,
+                               DCB5516B247F3DB50009A859 /* CKKSCreateCKZoneOperation.m */,
+                               DCB55173247F48290009A859 /* CKKSDeleteCKZoneOperation.h */,
+                               DCB55174247F48290009A859 /* CKKSDeleteCKZoneOperation.m */,

                                DC5BB4F01E0C86800010F836 /* CKKSIncomingQueueOperation.h */,
                                DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */,
                                DC5BB4FC1E0C98320010F836 /* CKKSOutgoingQueueOperation.h */,
                                DC5BB4F01E0C86800010F836 /* CKKSIncomingQueueOperation.h */,
                                DC5BB4F11E0C86800010F836 /* CKKSIncomingQueueOperation.m */,
                                DC5BB4FC1E0C98320010F836 /* CKKSOutgoingQueueOperation.h */,


@@ -20377,8 +24266,12 @@
                                DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */,
                                DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */,
                                DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */,
                                DCD662F41E329B6800188186 /* CKKSNewTLKOperation.m */,
                                DCBF2F831F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h */,
                                DCBF2F841F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.m */,

+                               DC061A6E246211DD0026ADB3 /* CKKSLocalResetOperation.h */,
+                               DC061A70246211DE0026ADB3 /* CKKSLocalResetOperation.m */,

                                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */,
                                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */,
                                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */,
                                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */,

+                               DC5F65AC2225C22C0051E9FA /* CKKSProvideKeySetOperation.h */,
+                               DC5F65AD2225C22C0051E9FA /* CKKSProvideKeySetOperation.m */,

                                DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */,
                                DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */,
                                DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */,
                                DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */,
                                DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */,
                                DC1DA65C1E4554620094CE7F /* CKKSScanLocalItemsOperation.h */,


@@ -20400,17 +24293,17 @@
                DCD662F21E3294DE00188186 /* CloudKit Support */ = {
                        isa = PBXGroup;
                        children = (
                DCD662F21E3294DE00188186 /* CloudKit Support */ = {
                        isa = PBXGroup;
                        children = (

+                               DC614C4F22A9BDB500E16ADA /* CKKSZoneModifier.h */,
+                               DC614C5022A9BDB500E16ADA /* CKKSZoneModifier.m */,

                                DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */,
                                DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */,
                                DC222CA91E08C57400B09171 /* CloudKitDependencies.h */,
                                DC9082C21EA0276000D0C1C5 /* CKKSZoneChangeFetcher.h */,
                                DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */,
                                DC222CA91E08C57400B09171 /* CloudKitDependencies.h */,

-                               DCEA5D831E2F14810089CF55 /* CKKSAPSReceiver.h */,
-                               DCEA5D841E2F14810089CF55 /* CKKSAPSReceiver.m */,
-                               DCEA5D951E3014250089CF55 /* CKKSZone.h */,
-                               DCEA5D961E3014250089CF55 /* CKKSZone.m */,
+                               DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */,
+                               DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */,

                                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */,
                                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */,
                                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */,
                                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */,

-                               DCFB12C31E95A4C000510F5F /* CKKSCKAccountStateTracker.h */,
-                               DCFB12C41E95A4C000510F5F /* CKKSCKAccountStateTracker.m */,
+                               DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */,
+                               DCFB12C41E95A4C000510F5F /* CKKSAccountStateTracker.m */,

                                DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */,
                                DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */,
                                DC94BCC81F10448600E07CEB /* CloudKitCategories.h */,
                                DC2C5F5A1F0EB97E00FEBDA7 /* CKKSNotifier.h */,
                                DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */,
                                DC94BCC81F10448600E07CEB /* CloudKitCategories.h */,


@@ -20419,6 +24312,49 @@
                        name = "CloudKit Support";
                        sourceTree = "<group>";
                };
                        name = "CloudKit Support";
                        sourceTree = "<group>";
                };

+               DCE0777B21ADD92B002662FD /* proto */ = {
+                       isa = PBXGroup;
+                       children = (
+                               BE7089991F9AAF57001ACC20 /* generated */,
+                               BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.proto */,
+                               DC88466922373A4000738068 /* TPPBDictionaryMatchingRule.proto */,
+                               BEC3739B20CF2AA200DBDF5B /* TPPBDisposition.proto */,
+                               BEC373C120D8224A00DBDF5B /* TPPBDispositionEntry.proto */,
+                               BE7089CB1FA3B19A001ACC20 /* TPPBPeerDynamicInfo.proto */,
+                               BE7089DB1FA407E4001ACC20 /* TPPBPeerPermanentInfo.proto */,
+                               BE7089CC1FA3B332001ACC20 /* TPPBPeerStableInfo.proto */,
+                               6C0C807D20EAF86100334E33 /* TPPBPolicyDocument.proto */,
+                               6C0C807F20EAFB9600334E33 /* TPPBPolicyCategoriesByView.proto */,
+                               6C0C808020EAFB9600334E33 /* TPPBPolicyModelToCategory.proto */,
+                               6C0C808320EAFD7A00334E33 /* TPPBPolicyIntroducersByCategory.proto */,
+                               1B8341B72239AD39002BF18A /* TPPBPolicyKeyViewMapping.proto */,
+                               BEC373A620D810D800DBDF5B /* TPPBPolicyProhibits.proto */,
+                               6C70D8D520EBDE4500AB6FAF /* TPPBPolicyRedaction.proto */,
+                               BE7089D91FA3F0AF001ACC20 /* TPPBPolicySecret.proto */,
+                               BEC373A720D810D900DBDF5B /* TPPBUnknownMachineID.proto */,
+                               BE7089911F9AA027001ACC20 /* TPPBVoucher.proto */,
+                       );
+                       path = proto;
+                       sourceTree = "<group>";
+               };
+               DCE0777C21ADE96C002662FD /* generated */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6C6AF17D221A06F70091CE0A /* SecDbKeychainSerializedMetadataKey.h */,
+                               6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */,
+                               47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */,
+                               47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */,
+                               47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */,
+                               47922D361FAA7C030008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m */,
+                               47922D3B1FAA7C100008F7E0 /* SecDbKeychainSerializedMetadata.h */,
+                               47922D3A1FAA7C0F0008F7E0 /* SecDbKeychainSerializedMetadata.m */,
+                               47922D3E1FAA7C1A0008F7E0 /* SecDbKeychainSerializedSecretData.h */,
+                               47922D3F1FAA7C1B0008F7E0 /* SecDbKeychainSerializedSecretData.m */,
+                       );
+                       name = generated;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };

                DCE4E6D61D7A420100AFB96E /* SecurityTestsOSX */ = {
                        isa = PBXGroup;
                        children = (
                DCE4E6D61D7A420100AFB96E /* SecurityTestsOSX */ = {
                        isa = PBXGroup;
                        children = (


@@ -20443,6 +24379,12 @@
                        isa = PBXGroup;
                        children = (
                                D4BEECE61E93093A00F76D1A /* trustd.c */,
                        isa = PBXGroup;
                        children = (
                                D4BEECE61E93093A00F76D1A /* trustd.c */,

+                               D4B68C64211A8186009FED69 /* trustd_spi.h */,
+                               D4B68C65211A8186009FED69 /* trustd_spi.c */,
+                               D47DCCB423427C7D00B80E37 /* md.m */,
+                               D47DCCB723427C8D00B80E37 /* md.h */,
+                               D47C4579255244AD00460750 /* CertificateTransparency.m */,
+                               D47C4730255246FC00460750 /* CertificateTransparency.h */,

                                D43DBED71E99D17100C04AEA /* nameconstraints.c */,
                                D43DBED81E99D17100C04AEA /* nameconstraints.h */,
                                D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */,
                                D43DBED71E99D17100C04AEA /* nameconstraints.c */,
                                D43DBED81E99D17100C04AEA /* nameconstraints.h */,
                                D43DBED91E99D17100C04AEA /* OTATrustUtilities.m */,


@@ -20475,12 +24417,13 @@
                                D43761651EB2996C00954447 /* SecRevocationNetworking.m */,
                                D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */,
                                D43DBEF41E99D17300C04AEA /* SecRevocationServer.h */,
                                D43761651EB2996C00954447 /* SecRevocationNetworking.m */,
                                D43DBEF31E99D17300C04AEA /* SecRevocationServer.c */,
                                D43DBEF41E99D17300C04AEA /* SecRevocationServer.h */,

+                               5F8494FF22DFB502008B3EFB /* SecTrustExceptionResetCount.m */,

                                D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */,
                                D43DBEF61E99D17300C04AEA /* SecTrustLoggingServer.h */,
                                D43DBEF71E99D17300C04AEA /* SecTrustServer.c */,
                                D43DBEF81E99D17300C04AEA /* SecTrustServer.h */,
                                D43DBEF91E99D17300C04AEA /* SecTrustStoreServer.c */,
                                D43DBEF51E99D17300C04AEA /* SecTrustLoggingServer.m */,
                                D43DBEF61E99D17300C04AEA /* SecTrustLoggingServer.h */,
                                D43DBEF71E99D17300C04AEA /* SecTrustServer.c */,
                                D43DBEF81E99D17300C04AEA /* SecTrustServer.h */,
                                D43DBEF91E99D17300C04AEA /* SecTrustStoreServer.c */,

-                               D46B379F2151B6E50083DAAA /* SecTrustStoreServer.m */,
+                               D4EF321E215F0F76000A31A5 /* SecTrustStoreServer.m */,

                                D43DBEFA1E99D17300C04AEA /* SecTrustStoreServer.h */,
                                D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */,
                                D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */,
                                D43DBEFA1E99D17300C04AEA /* SecTrustStoreServer.h */,
                                D4961BBD2079423300F16DA7 /* TrustURLSessionDelegate.m */,
                                D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */,


@@ -20489,6 +24432,7 @@
                                DCE4E85D1D7A584D00AFB96E /* iOS */,
                        );
                        name = trustd;
                                DCE4E85D1D7A584D00AFB96E /* iOS */,
                        );
                        name = trustd;

+                       path = trust/trustd;

                        sourceTree = "<group>";
                };
                DCE4E85D1D7A584D00AFB96E /* iOS */ = {
                        sourceTree = "<group>";
                };
                DCE4E85D1D7A584D00AFB96E /* iOS */ = {


@@ -20499,7 +24443,7 @@
                                D41257EE1E941DA800781F23 /* com.apple.trustd.plist */,
                                D45068691E948ACE00FA7675 /* entitlements.plist */,
                        );
                                D41257EE1E941DA800781F23 /* com.apple.trustd.plist */,
                                D45068691E948ACE00FA7675 /* entitlements.plist */,
                        );

-                       name = iOS;
+                       path = iOS;

                        sourceTree = "<group>";
                };
                DCE4E85E1D7A585300AFB96E /* macOS */ = {
                        sourceTree = "<group>";
                };
                DCE4E85E1D7A585300AFB96E /* macOS */ = {


@@ -20511,7 +24455,7 @@
                                D41257EA1E941CF200781F23 /* com.apple.trustd.plist */,
                                D41257E91E941CF200781F23 /* com.apple.trustd.agent.plist */,
                        );
                                D41257EA1E941CF200781F23 /* com.apple.trustd.plist */,
                                D41257E91E941CF200781F23 /* com.apple.trustd.agent.plist */,
                        );

-                       name = macOS;
+                       path = macOS;

                        sourceTree = "<group>";
                };
                DCE4E8A01D7F352600AFB96E /* authd */ = {
                        sourceTree = "<group>";
                };
                DCE4E8A01D7F352600AFB96E /* authd */ = {


@@ -20533,6 +24477,7 @@
                                DC24B5641DA326B900330B48 /* Info.plist */,
                                DC24B5651DA326B900330B48 /* mechanism.h */,
                                DC24B5661DA326B900330B48 /* object.h */,
                                DC24B5641DA326B900330B48 /* Info.plist */,
                                DC24B5651DA326B900330B48 /* mechanism.h */,
                                DC24B5661DA326B900330B48 /* object.h */,

+                               F681C3AA2386B8B40083F22C /* PreloginUserDb.h */,

                                DC24B5671DA326B900330B48 /* process.h */,
                                DC24B5681DA326B900330B48 /* rule.h */,
                                DC24B5691DA326B900330B48 /* server.h */,
                                DC24B5671DA326B900330B48 /* process.h */,
                                DC24B5681DA326B900330B48 /* rule.h */,
                                DC24B5691DA326B900330B48 /* server.h */,


@@ -20551,6 +24496,7 @@
                                DCE4E8AB1D7F353900AFB96E /* main.c */,
                                DCE4E8AC1D7F353900AFB96E /* mechanism.c */,
                                DCE4E8AD1D7F353900AFB96E /* object.c */,
                                DCE4E8AB1D7F353900AFB96E /* main.c */,
                                DCE4E8AC1D7F353900AFB96E /* mechanism.c */,
                                DCE4E8AD1D7F353900AFB96E /* object.c */,

+                               F681C3A82386B8B40083F22C /* PreloginUserDb.m */,

                                DCE4E8AE1D7F353900AFB96E /* process.c */,
                                DCE4E8AF1D7F353900AFB96E /* rule.c */,
                                DCE4E8B01D7F353900AFB96E /* server.c */,
                                DCE4E8AE1D7F353900AFB96E /* process.c */,
                                DCE4E8AF1D7F353900AFB96E /* rule.c */,
                                DCE4E8B01D7F353900AFB96E /* server.c */,


@@ -20704,25 +24650,6 @@
                        name = AppleCSP;
                        sourceTree = "<group>";
                };
                        name = AppleCSP;
                        sourceTree = "<group>";
                };

-               DCF7834B1D88B60D00E694BB /* BSafeCSP */ = {
-                       isa = PBXGroup;
-                       children = (
-                               DCF7833F1D88B60D00E694BB /* algmaker.cpp */,
-                               DCF783401D88B60D00E694BB /* bsafeAsymmetric.cpp */,
-                               DCF783411D88B60D00E694BB /* bsafeContext.cpp */,
-                               DCF783421D88B60D00E694BB /* bsafecsp.h */,
-                               DCF783431D88B60D00E694BB /* bsafecspi.h */,
-                               DCF783441D88B60D00E694BB /* bsafeKeyGen.cpp */,
-                               DCF783451D88B60D00E694BB /* bsafePKCS1.cpp */,
-                               DCF783461D88B60D00E694BB /* bsafePKCS1.h */,
-                               DCF783471D88B60D00E694BB /* bsafeSymmetric.cpp */,
-                               DCF783481D88B60D00E694BB /* bsobjects.h */,
-                               DCF783491D88B60D00E694BB /* memory.cpp */,
-                               DCF7834A1D88B60D00E694BB /* miscalgorithms.cpp */,
-                       );
-                       name = BSafeCSP;
-                       sourceTree = "<group>";
-               };

                DCF7834F1D88B60D00E694BB /* ComCryption */ = {
                        isa = PBXGroup;
                        children = (
                DCF7834F1D88B60D00E694BB /* ComCryption */ = {
                        isa = PBXGroup;
                        children = (


@@ -20872,7 +24799,6 @@
                        children = (
                                DCF783211D88B60D00E694BB /* AES */,
                                DCF7833E1D88B60D00E694BB /* AppleCSP */,
                        children = (
                                DCF783211D88B60D00E694BB /* AES */,
                                DCF7833E1D88B60D00E694BB /* AppleCSP */,

-                               DCF7834B1D88B60D00E694BB /* BSafeCSP */,

                                DCF7834F1D88B60D00E694BB /* ComCryption */,
                                DCF7835B1D88B60D00E694BB /* CryptKitCSP */,
                                DCF783641D88B60D00E694BB /* DiffieHellman */,
                                DCF7834F1D88B60D00E694BB /* ComCryption */,
                                DCF7835B1D88B60D00E694BB /* CryptKitCSP */,
                                DCF783641D88B60D00E694BB /* DiffieHellman */,


@@ -21278,10 +25204,75 @@
                                DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */,
                                DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */,
                                DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */,
                                DCD6C4B11EC5302500414FEE /* CKKSNearFutureScheduler.m */,
                                DCFE1C321F17ECE5007640C8 /* CKKSCondition.h */,
                                DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */,

+                               DC3AF52A2229E6C0006577E8 /* CKKSListenerCollection.h */,
+                               DC3AF52B2229E6C0006577E8 /* CKKSListenerCollection.m */,

                        );
                        name = "dispatch Support";
                        sourceTree = "<group>";
                };
                        );
                        name = "dispatch Support";
                        sourceTree = "<group>";
                };

+               E060D19D2124780F0025B833 /* OctagonTestHarness */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D19E2124780F0025B833 /* OctagonTestHarness.h */,
+                               EB3F9C9B21FCFC60007B6EBA /* OctagonTestHarness.m */,
+                               EB3F9C9E21FCFF8E007B6EBA /* OctagonTestHarness.exp */,
+                               E060D1A12124780F0025B833 /* Info.plist */,
+                       );
+                       path = OctagonTestHarness;
+                       sourceTree = "<group>";
+               };
+               E060D1BD212478120025B833 /* OctagonTestHarnessXPCService */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D2BD21248F820025B833 /* Entitlements.plist */,
+                               E060D1BE212478120025B833 /* main.m */,
+                               E060D1C0212478120025B833 /* OctagonTestHarnessXPCServiceDelegate.h */,
+                               E060D1C3212478120025B833 /* OctagonTestHarnessXPCServiceDelegate.m */,
+                               E060D19F2124780F0025B833 /* OctagonTestHarnessXPCService.h */,
+                               E09E09E9215506570042C7D3 /* OctagonTestHarnessXPCService.m */,
+                               EB056E411FE5E390000A771E /* SecRemoteDevice.h */,
+                               EB056E421FE5E390000A771E /* SecRemoteDevice.m */,
+                               EB056E401FE5E390000A771E /* SecRemoteDeviceProtocol.h */,
+                               E060D1C6212478120025B833 /* Info.plist */,
+                       );
+                       path = OctagonTestHarnessXPCService;
+                       sourceTree = "<group>";
+               };
+               E060D23E21247C680025B833 /* OctagonTestHarnessXPCServiceProtocol */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D23F21247C680025B833 /* Package.swift */,
+                               E060D24021247C680025B833 /* Sources */,
+                               E060D24521247C680025B833 /* Info.plist */,
+                       );
+                       path = OctagonTestHarnessXPCServiceProtocol;
+                       sourceTree = "<group>";
+               };
+               E060D24021247C680025B833 /* Sources */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D24121247C680025B833 /* OctagonTestHarnessXPCServiceProtocol */,
+                       );
+                       path = Sources;
+                       sourceTree = "<group>";
+               };
+               E060D24121247C680025B833 /* OctagonTestHarnessXPCServiceProtocol */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D24221247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.m */,
+                               E060D24321247C680025B833 /* include */,
+                       );
+                       path = OctagonTestHarnessXPCServiceProtocol;
+                       sourceTree = "<group>";
+               };
+               E060D24321247C680025B833 /* include */ = {
+                       isa = PBXGroup;
+                       children = (
+                               E060D24421247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.h */,
+                       );
+                       path = include;
+                       sourceTree = "<group>";
+               };

                E710C74A1331946500F85568 /* SecurityTests */ = {
                        isa = PBXGroup;
                        children = (
                E710C74A1331946500F85568 /* SecurityTests */ = {
                        isa = PBXGroup;
                        children = (


@@ -21295,7 +25286,6 @@
                                0C0C88771CCEC5BD00617D1B /* si-82-sectrust-ct-data */,
                                DCE4E72E1D7A436300AFB96E /* si-82-sectrust-ct-logs.plist */,
                                D4C6C5C71FB2AD3F007EA57E /* si-87-sectrust-name-constraints */,
                                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 */,
                                4C50ACFB1410671D00EE92DE /* DigiNotar */,
                                79679E241462028800CF997F /* DigicertMalaysia */,
                                E710C74B1331946500F85568 /* Supporting Files */,


@@ -21319,6 +25309,9 @@
                        isa = PBXGroup;
                        children = (
                                4C922CB2097F1984004CEEBD /* Security */,
                        isa = PBXGroup;
                        children = (
                                4C922CB2097F1984004CEEBD /* Security */,

+                               1B2BD391235E050D009A8624 /* SecEC-tapi.h */,
+                               1B2BD393235E050E009A8624 /* SecPolicy-tapi.h */,
+                               1B2BD394235E050E009A8624 /* Security-tapi.h */,

                        );
                        name = Headers;
                        sourceTree = "<group>";
                        );
                        name = Headers;
                        sourceTree = "<group>";


@@ -21357,35 +25350,21 @@
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };
                        name = "Supporting Files";
                        sourceTree = "<group>";
                };

-               E7C4D03512F9EB210022E067 /* iOS */ = {
-                       isa = PBXGroup;
-                       children = (
-                               7901790E12D51F7200CA4D44 /* SecCmsBase.h */,
-                               7901790F12D51F7200CA4D44 /* SecCmsContentInfo.h */,
-                               7901791012D51F7200CA4D44 /* SecCmsDecoder.h */,
-                               7901791112D51F7200CA4D44 /* SecCmsDigestContext.h */,
-                               D4FBBD601DD66196004408F7 /* CMSEncoder.h */,
-                               D4FBBD611DD66196004408F7 /* CMSDecoder.h */,
-                               7901791212D51F7200CA4D44 /* SecCmsEncoder.h */,
-                               7901791312D51F7200CA4D44 /* SecCmsEnvelopedData.h */,
-                               7901791412D51F7200CA4D44 /* SecCmsMessage.h */,
-                               7901791512D51F7200CA4D44 /* SecCmsRecipientInfo.h */,
-                               7901791612D51F7200CA4D44 /* SecCmsSignedData.h */,
-                               7901791712D51F7200CA4D44 /* SecCmsSignerInfo.h */,
-                       );
-                       name = iOS;
-                       path = libsecurity_smime/lib;
-                       sourceTree = "<group>";
-               };

                E7D847C61C6BE9710025BB44 /* KeychainCircle.framework */ = {
                        isa = PBXGroup;
                        children = (
                E7D847C61C6BE9710025BB44 /* KeychainCircle.framework */ = {
                        isa = PBXGroup;
                        children = (

+                               5A47FFAF228F5DAB00F781B8 /* Protocol Buffers */,

                                E7D848031C6BEFAB0025BB44 /* Tests */,
                                E7D848011C6BEE360025BB44 /* Supporting Files */,
                                E7E3EFE21CBC195700E79A5D /* KCAccountKCCircleDelegate.h */,
                                E7E3EFB91CBC192A00E79A5D /* KCAccountKCCircleDelegate.m */,
                                E7D848031C6BEFAB0025BB44 /* Tests */,
                                E7D848011C6BEE360025BB44 /* Supporting Files */,
                                E7E3EFE21CBC195700E79A5D /* KCAccountKCCircleDelegate.h */,
                                E7E3EFB91CBC192A00E79A5D /* KCAccountKCCircleDelegate.m */,

+                               5A47FFB4228F5E9000F781B8 /* KCInitialMessageData.h */,
+                               5A47FFB5228F5E9000F781B8 /* KCInitialMessageData.m */,

                                E7F480131C7397CE00390FDB /* KCJoiningSession.h */,
                                E7F480131C7397CE00390FDB /* KCJoiningSession.h */,

-                               E7F480141C73980D00390FDB /* KCJoiningRequestSession.m */,
+                               0C2A041A2152EF3000FD4FAD /* KCJoiningRequestSession+Internal.h */,
+                               E7F480141C73980D00390FDB /* KCJoiningRequestSecretSession.m */,
+                               DC6063B121B09AB200069B82 /* KCJoiningRequestCircleSession.m */,
+                               0C2A04152152ED7F00FD4FAD /* KCJoiningAcceptSession+Internal.h */,

                                E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */,
                                E794BAD91C7598E400339A0F /* KCJoiningMessages.h */,
                                E794BAFF1C7598F900339A0F /* KCJoiningMessages.m */,
                                E7F482AB1C7558F700390FDB /* KCJoiningAcceptSession.m */,
                                E794BAD91C7598E400339A0F /* KCJoiningMessages.h */,
                                E794BAFF1C7598F900339A0F /* KCJoiningMessages.m */,


@@ -21420,6 +25399,7 @@
                E7D848031C6BEFAB0025BB44 /* Tests */ = {
                        isa = PBXGroup;
                        children = (
                E7D848031C6BEFAB0025BB44 /* Tests */ = {
                        isa = PBXGroup;
                        children = (

+                               52DA3C6F23C7E63500FEEDFF /* KCTLKRequestTest.m */,

                                E7CFF7221C8660A000E3484E /* KeychainCircle.plist */,
                                E7D848061C6BEFFA0025BB44 /* Info.plist */,
                                E7D848041C6BEFC10025BB44 /* KCSRPTests.m */,
                                E7CFF7221C8660A000E3484E /* KeychainCircle.plist */,
                                E7D848061C6BEFFA0025BB44 /* Info.plist */,
                                E7D848041C6BEFC10025BB44 /* KCSRPTests.m */,


@@ -21428,6 +25408,8 @@
                                E7F4826F1C74FDD100390FDB /* KCJoiningSessionTest.m */,
                                EB108F121E6CE48B003B0456 /* KCParing.plist */,
                                EB413B7E1E663A8300592085 /* KCPairingTest.m */,
                                E7F4826F1C74FDD100390FDB /* KCJoiningSessionTest.m */,
                                EB108F121E6CE48B003B0456 /* KCParing.plist */,
                                EB413B7E1E663A8300592085 /* KCPairingTest.m */,

+                               0C5258BC21BB137800B32C96 /* FakeSOSControl.h */,
+                               0C5258B821BB05C100B32C96 /* FakeSOSControl.m */,

                        );
                        name = Tests;
                        sourceTree = "<group>";
                        );
                        name = Tests;
                        sourceTree = "<group>";


@@ -21435,15 +25417,63 @@
                E7FCBE401314471B000DE34E /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
                E7FCBE401314471B000DE34E /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (

-                               0C9FB40120D8729A00864612 /* CoreCDP.framework */,
-                               DC63D70920B3933000D088AD /* libOpenScriptingUtil.tbd */,
+                               D47A55892466100A0039285D /* MSUDataAccessor.framework */,
+                               6C99787C242364FB008C498D /* CoreFoundation.framework */,
+                               6C997879242364E5008C498D /* Foundation.framework */,
+                               F6B1B48924144B5E00CB3E3F /* libctkloginhelperlite.a */,
+                               0CCC22D523F39B2E00E1FCD0 /* CoreCDP.framework */,
+                               0CCC22B123F38B5B00E1FCD0 /* libsqlite3.0.tbd */,
+                               DA2F591523A32BB400C30285 /* SoftLinking.framework */,
+                               DC89608C2395C75500D339D9 /* CoreServices.framework */,
+                               BEC6A9142331992800080069 /* Network.framework */,
+                               D47AB2CA2356AD72005A3801 /* Network.framework */,
+                               0C6C2B6C2258295D00C53C96 /* UIKitCore.framework */,
+                               0C6C2B682258211800C53C96 /* AppleAccount.framework */,
+                               DC4A76A92212698B006F2D8F /* CloudServices.framework */,
+                               EB74CC252207ECCB00F1BBAD /* Preferences.framework */,
+                               EB7732DA21963BAD00FCF513 /* libz.1.tbd */,
+                               EB80DE57219600CF005B10FA /* libz.dylib */,
+                               482FE56B2177C7AE0031C11E /* AuthKit.framework */,
+                               D4FD4223217D7BE3002B7EE2 /* libarchive.2.tbd */,
+                               D458C511214E20840043D982 /* XCTest.framework */,
+                               D458C500214E1FAF0043D982 /* Foundation.framework */,
+                               D458C4FE214E1F8E0043D982 /* UIKit.framework */,
+                               0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */,
+                               D4B68C5C211A7D98009FED69 /* libDER.a */,
+                               EB490153211C0026001E6D6A /* UserManagement.framework */,
+                               475EDD0720D9A031009D2409 /* LocalAuthenticationPrivateUI.framework */,
+                               475EDD0520D98CE2009D2409 /* LocalAuthentication.framework */,
+                               475EDD0320D98CD0009D2409 /* libctkclient.a */,
+                               475EDD0120D98C81009D2409 /* libaks_acl.a */,
+                               475EDCFF20D98C64009D2409 /* IOKit.framework */,
+                               475EDCFD20D98C53009D2409 /* libaks.a */,
+                               475EDCF920D98C0D009D2409 /* CryptoTokenKit.framework */,
+                               475EDCF720D98BF6009D2409 /* CoreCDP.framework */,
+                               475EDCF520D98BCF009D2409 /* libACM.a */,
+                               475EDCF320D98B61009D2409 /* libMobileGestalt.dylib */,
+                               475EDCEE20D98AC7009D2409 /* SharedWebCredentials.framework */,
+                               475EDCEC20D98AB7009D2409 /* Accounts.framework */,
+                               475EDCEA20D98AAF009D2409 /* WirelessDiagnostics.framework */,
+                               475EDCE820D98AA8009D2409 /* SystemConfiguration.framework */,
+                               475EDCE420D98A71009D2409 /* ProtocolBuffer.framework */,
+                               475EDCE220D98A65009D2409 /* libsqlite3.dylib */,
+                               475EDCE020D98A5B009D2409 /* CoreData.framework */,
+                               475EDCDE20D98A54009D2409 /* ApplePushService.framework */,
+                               475EDCDC20D98A3C009D2409 /* SecurityFoundation.framework */,
+                               475EDCDA20D98A28009D2409 /* CloudKit.framework */,
+                               475EDCD420D98934009D2409 /* Security.framework */,
+                               EB067E8A20EC873D00B7D961 /* libcompression.tbd */,
+                               EB89111020E3C15D00DE533F /* UserManagement.framework */,
+                               BE53602C209BBF2F0027E25A /* libMobileGestalt.tbd */,
+                               D4A7DD7320A26CF900F51F3F /* AuthKit.framework */,
+                               AAD66304203362480073E17B /* libnetwork.tbd */,
+                               3DD1FFA9201FC5C30086D049 /* libcoretls_cfhelpers.tbd */,
+                               3DD1FFA8201FC5C20086D049 /* libcoretls.tbd */,

                                DC63D70220B3930700D088AD /* libxar.tbd */,
                                D4911167209558900066A1E4 /* CoreData.framework */,
                                4771D9A1209B7C3900BA9772 /* Accounts.framework */,
                                4771D99F209B7C2600BA9772 /* Security.framework */,
                                4C47FA8D20A51DC700384CB6 /* AppleFSCompression.framework */,
                                DC63D70220B3930700D088AD /* libxar.tbd */,
                                D4911167209558900066A1E4 /* CoreData.framework */,
                                4771D9A1209B7C3900BA9772 /* Accounts.framework */,
                                4771D99F209B7C2600BA9772 /* Security.framework */,
                                4C47FA8D20A51DC700384CB6 /* AppleFSCompression.framework */,

-                               5A94C6D4203CC2590066E391 /* AuthKit.framework */,
-                               5A94C6D1203CC1C60066E391 /* AOSAccountsLite.framework */,

                                091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */,
                                477A1F4C20320E4900ACD81D /* Accounts.framework */,
                                EB49B2DE202DF286003F34A0 /* CoreFollowUpUI.framework */,
                                091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */,
                                477A1F4C20320E4900ACD81D /* Accounts.framework */,
                                EB49B2DE202DF286003F34A0 /* CoreFollowUpUI.framework */,


@@ -21451,8 +25481,6 @@
                                EB49B2CE202DF111003F34A0 /* CoreFollowUp.framework */,
                                D4119E72202BDF2B0048587B /* libz.tbd */,
                                472339611FD7155C00CB6A72 /* libprequelite.dylib */,
                                EB49B2CE202DF111003F34A0 /* CoreFollowUp.framework */,
                                D4119E72202BDF2B0048587B /* libz.tbd */,
                                472339611FD7155C00CB6A72 /* libprequelite.dylib */,

-                               3DD1FFA9201FC5C30086D049 /* libcoretls_cfhelpers.tbd */,
-                               3DD1FFA8201FC5C20086D049 /* libcoretls.tbd */,

                                47D1838B1FB3827700CFCD89 /* OCMock.framework */,
                                4727FBE81F9921D00003AE36 /* libACM.a */,
                                4727FBE61F9921890003AE36 /* ApplePushService.framework */,
                                47D1838B1FB3827700CFCD89 /* OCMock.framework */,
                                4727FBE81F9921D00003AE36 /* libACM.a */,
                                4727FBE61F9921890003AE36 /* ApplePushService.framework */,


@@ -21553,9 +25581,7 @@
                                DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */,
                                EB2CA4D81D2C28C800AB770F /* libaks.a */,
                                4432AF8C1A01472C000958DC /* libaks_acl.a */,
                                DC1789141D77997F00B50D50 /* libOpenScriptingUtil.dylib */,
                                EB2CA4D81D2C28C800AB770F /* libaks.a */,
                                4432AF8C1A01472C000958DC /* libaks_acl.a */,

-                               DC1789161D77998700B50D50 /* libauto.dylib */,

                                DC1789181D77998C00B50D50 /* libbsm.dylib */,
                                DC1789181D77998C00B50D50 /* libbsm.dylib */,

-                               E7F482A51C75453900390FDB /* libcoreauthd_test_client.a */,

                                0CFC029B1D41650700E6283B /* libcoretls.dylib */,
                                E7F482A21C7544E600390FDB /* libctkclient_test.a */,
                                EBE54D771BE33227000C4856 /* libmis.dylib */,
                                0CFC029B1D41650700E6283B /* libcoretls.dylib */,
                                E7F482A21C7544E600390FDB /* libctkclient_test.a */,
                                EBE54D771BE33227000C4856 /* libmis.dylib */,


@@ -21569,39 +25595,22 @@
                        name = Frameworks;
                        sourceTree = "<group>";
                };
                        name = Frameworks;
                        sourceTree = "<group>";
                };

-               EB056E3F1FE5E390000A771E /* DeviceSimulator */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EBCE165C1FE6F4CE002E7CCC /* DeviceSimulator-Entitlements.plist */,
-                               EB056E411FE5E390000A771E /* DeviceSimulator.h */,
-                               EB056E421FE5E390000A771E /* DeviceSimulator.m */,
-                               EB056E441FE5E390000A771E /* DeviceSimulatorMain.m */,
-                               EB056E401FE5E390000A771E /* DeviceSimulatorProtocol.h */,
-                               EB056E461FE5E391000A771E /* Info.plist */,
-                       );
-                       path = DeviceSimulator;
-                       sourceTree = "<group>";
-               };
-               EB05C4F21FE5E48B00D68712 /* MultiDeviceSimulatorTests */ = {
+               EB0BC9641C3C792E00785842 /* secedumodetest */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               4885DCAB207FF0780071FB7B /* ClientInfoByNotification.m */,
-                               EB05C4F31FE5E48B00D68712 /* MultiDeviceSimulatorTests.m */,
-                               EBCE165E1FE7313C002E7CCC /* MultiDeviceNetworking.h */,
-                               EBCE165F1FE7313C002E7CCC /* MultiDeviceNetworking.m */,
-                               EBCE16611FE73327002E7CCC /* MultiDeviceNetworkingProtocol.h */,
-                               EB05C4F51FE5E48B00D68712 /* Info.plist */,
+                               EB0BC9651C3C794700785842 /* secedumodetest.entitlements */,
+                               EB0BC9661C3C794700785842 /* secedumodetest.m */,

                        );
                        );

-                       path = MultiDeviceSimulatorTests;
+                       name = secedumodetest;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               EB0BC9641C3C792E00785842 /* secedumodetest */ = {
+               EB0E1B902358FA4B002B6037 /* generated_source */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               EB0BC9651C3C794700785842 /* secedumodetest.entitlements */,
-                               EB0BC9661C3C794700785842 /* secedumodetest.m */,
+                               EB0E1B922358FADE002B6037 /* SOSAccountConfiguration.h */,
+                               EB0E1B932358FADE002B6037 /* SOSAccountConfiguration.m */,

                        );
                        );

-                       name = secedumodetest;
+                       path = generated_source;

                        sourceTree = "<group>";
                };
                EB1055641E14DB370003C309 /* secfuzzer */ = {
                        sourceTree = "<group>";
                };
                EB1055641E14DB370003C309 /* secfuzzer */ = {


@@ -21637,15 +25646,16 @@
                                DC5225091E402D8B0021640A /* PlatformLibraries.xcconfig */,
                                DC976C581E3AC5E50012A6DD /* PlatformFeatures.xcconfig */,
                                EB2CA5561D2C30F700AB770F /* Security.xcconfig */,
                                DC5225091E402D8B0021640A /* PlatformLibraries.xcconfig */,
                                DC976C581E3AC5E50012A6DD /* PlatformFeatures.xcconfig */,
                                EB2CA5561D2C30F700AB770F /* Security.xcconfig */,

-                               D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */,

                                DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */,
                                DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */,
                                DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */,
                                D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */,
                                D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */,
                                DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */,
                                DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */,
                                DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */,
                                DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */,
                                D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */,
                                D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */,
                                DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */,

-                               BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */,

                                EBF9AE171F536D0300FECBF7 /* Version.xcconfig */,
                                EBF9AE171F536D0300FECBF7 /* Version.xcconfig */,

+                               DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */,
+                               DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */,
+                               725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */,

                        );
                        name = xcconfig;
                        sourceTree = "<group>";
                        );
                        name = xcconfig;
                        sourceTree = "<group>";


@@ -21679,34 +25689,91 @@
                EB49B2AF202D8780003F34A0 /* secdmockaks */ = {
                        isa = PBXGroup;
                        children = (
                EB49B2AF202D8780003F34A0 /* secdmockaks */ = {
                        isa = PBXGroup;
                        children = (

+                               EB627A74233E33A300F32437 /* generated_source */,

                                72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */,
                                EBE700FE204676E700E00A87 /* secdmock_db_version_11_1.h */,
                                72D1E5F3202FE43C003A38C5 /* secdmock_db_version_10_5.h */,
                                EBE700FE204676E700E00A87 /* secdmock_db_version_11_1.h */,

-                               EB49B2B0202D8780003F34A0 /* secdmockaks.m */,
+                               EB49B2B0202D8780003F34A0 /* mockaksKeychain.m */,
+                               EB1E069E211E17B70088F0B1 /* mockaksWatchDog.m */,
+                               EB1E069C211E149A0088F0B1 /* mockaksxcbase.h */,
+                               EB1E0695211E137E0088F0B1 /* mockaksxcbase.m */,

                                EB6667BE204CD65E000B404F /* testPlistDER.m */,
                                EB49B303202FB8DE003F34A0 /* mockaks.h */,
                                EB49B2E4202DFE7F003F34A0 /* mockaks.m */,
                                EB6667BE204CD65E000B404F /* testPlistDER.m */,
                                EB49B303202FB8DE003F34A0 /* mockaks.h */,
                                EB49B2E4202DFE7F003F34A0 /* mockaks.m */,

+                               EBDCBFFE233DD31700806566 /* MockAKSRefKey.proto */,
+                               EB627A6F233E323600F32437 /* MockAKSOptionalParameters.proto */,

                                EB49B2B2202D8780003F34A0 /* Info.plist */,
                                EB49B2B2202D8780003F34A0 /* Info.plist */,

+                               DC311E782124B8EF002F5EAE /* aks_real_witness.h */,
+                               DC311E792124B8EF002F5EAE /* aks_real_witness.c */,

                        );
                        name = secdmockaks;
                        path = tests/secdmockaks;
                        sourceTree = "<group>";
                };
                        );
                        name = secdmockaks;
                        path = tests/secdmockaks;
                        sourceTree = "<group>";
                };

-               EB80211C1D3D9044008540C4 /* Modules */ = {
+               EB627A74233E33A300F32437 /* generated_source */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               EB8021411D3D90BB008540C4 /* Security.iOS.modulemap */,
-                               EB8021421D3D90BB008540C4 /* Security.macOS.modulemap */,
+                               EB627A78233E342B00F32437 /* MockAKSOptionalParameters.h */,
+                               EB627A77233E342B00F32437 /* MockAKSOptionalParameters.m */,
+                               EB627A76233E342900F32437 /* MockAKSRefKey.h */,
+                               EB627A75233E342800F32437 /* MockAKSRefKey.m */,

                        );
                        );

-                       name = Modules;
+                       path = generated_source;
+                       sourceTree = "<group>";
+               };
+               EB74CC182207E48000F1BBAD /* KeychainSettings */ = {
+                       isa = PBXGroup;
+                       children = (
+                               EB74CC192207E48100F1BBAD /* Info.plist */,
+                               EB74CC1D2207E4BA00F1BBAD /* KeychainSettings.h */,
+                               EB74CC1E2207E4BA00F1BBAD /* KeychainSettings.m */,
+                               EB74CC212207E4FA00F1BBAD /* KeychainSettings.plist */,
+                               EB74CC2E2207FBE900F1BBAD /* KeychainSettingsOctagonPeers.plist */,
+                               EBB02A56221FF362007241CB /* KeychainSettingsCKKSViews.plist */,
+                       );
+                       path = KeychainSettings;
+                       sourceTree = "<group>";
+               };
+               EB7E90F62193F93B00B1FA21 /* C2Metric */ = {
+                       isa = PBXGroup;
+                       children = (
+                               EB7E91092193F97600B1FA21 /* SECC2MPCloudKitInfo.h */,
+                               EB7E91042193F97400B1FA21 /* SECC2MPCloudKitInfo.m */,
+                               EB7E91032193F97400B1FA21 /* SECC2MPCloudKitOperationGroupInfo.h */,
+                               EB7E91062193F97500B1FA21 /* SECC2MPCloudKitOperationGroupInfo.m */,
+                               EB7E910D2193F97800B1FA21 /* SECC2MPCloudKitOperationInfo.h */,
+                               EB7E90FC2193F97100B1FA21 /* SECC2MPCloudKitOperationInfo.m */,
+                               EB7E90FB2193F97000B1FA21 /* SECC2MPDeviceInfo.h */,
+                               EB7E90F92193F97000B1FA21 /* SECC2MPDeviceInfo.m */,
+                               EB7E910C2193F97700B1FA21 /* SECC2MPError.h */,
+                               EB7E90FD2193F97100B1FA21 /* SECC2MPError.m */,
+                               EB7E90FE2193F97200B1FA21 /* SECC2MPGenericEvent.h */,
+                               EB7E91022193F97300B1FA21 /* SECC2MPGenericEvent.m */,
+                               EB7E90F82193F96F00B1FA21 /* SECC2MPGenericEventMetric.h */,
+                               EB7E90FF2193F97200B1FA21 /* SECC2MPGenericEventMetric.m */,
+                               EB7E91002193F97200B1FA21 /* SECC2MPGenericEventMetricValue.h */,
+                               EB7E910A2193F97600B1FA21 /* SECC2MPGenericEventMetricValue.m */,
+                               EB7E91012193F97300B1FA21 /* SECC2MPInternalTestConfig.h */,
+                               EB7E90FA2193F97000B1FA21 /* SECC2MPInternalTestConfig.m */,
+                               EB7E90F72193F96F00B1FA21 /* SECC2MPMetric.h */,
+                               EB7E91052193F97400B1FA21 /* SECC2MPMetric.m */,
+                               EB7E910E2193F97800B1FA21 /* SECC2MPNetworkEvent.h */,
+                               EB7E91072193F97500B1FA21 /* SECC2MPNetworkEvent.m */,
+                               EB7E91082193F97600B1FA21 /* SECC2MPServerInfo.h */,
+                               EB7E910B2193F97700B1FA21 /* SECC2MPServerInfo.m */,
+                       );
+                       path = C2Metric;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               EB81D0CB1FE5838B00FD7F16 /* MultiDeviceSimulator */ = {
+               EB80211C1D3D9044008540C4 /* Modules */ = {

                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (

-                               EB05C4F21FE5E48B00D68712 /* MultiDeviceSimulatorTests */,
-                               EB056E3F1FE5E390000A771E /* DeviceSimulator */,
+                               0CF7613D23F24B5D00A3C3AD /* KeychainCircle.modulemap */,
+                               0CF7613F23F24B5E00A3C3AD /* OctagonTrust.modulemap */,
+                               EB8021411D3D90BB008540C4 /* Security.iOS.modulemap */,
+                               EB8021421D3D90BB008540C4 /* Security.macOS.modulemap */,
+                               617570BA22C2D19E00EFBA37 /* Security.macOS.private.modulemap */,

                        );
                        );

-                       path = MultiDeviceSimulator;
+                       name = Modules;

                        sourceTree = "<group>";
                };
                EB9C1D7C1BDFD0E100F89272 /* secbackupntest */ = {
                        sourceTree = "<group>";
                };
                EB9C1D7C1BDFD0E100F89272 /* secbackupntest */ = {


@@ -21720,7 +25787,12 @@
                EB9C1DAA1BDFD0FE00F89272 /* RegressionTests */ = {
                        isa = PBXGroup;
                        children = (
                EB9C1DAA1BDFD0FE00F89272 /* RegressionTests */ = {
                        isa = PBXGroup;
                        children = (

+                               3E4D4DFF2531174400B124B3 /* secsecstaticcodeapitest */,
+                               3E88361224F0693200E9F4D6 /* secseccodeapitest */,
+                               6CF33CA2238714C900D1E75D /* bats_utd_plist.h */,
+                               6CF33CA4238714C900D1E75D /* PreprocessPlist.sh */,

                                EB9C1DAD1BDFD49400F89272 /* Security.plist */,
                                EB9C1DAD1BDFD49400F89272 /* Security.plist */,

+                               EBDAA7E320EC46CF003EA6E5 /* SecurityLocalKeychain.plist */,

                                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */,
                                EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */,
                                EB2D549F1F02A25700E46890 /* SecAtomicFile */,
                                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */,
                                EB3A8DD71BEEC4D6001A89AA /* Security_edumode.plist */,
                                EB2D549F1F02A25700E46890 /* SecAtomicFile */,


@@ -21748,6 +25820,14 @@
                        name = secitemnotifications;
                        sourceTree = "<group>";
                };
                        name = secitemnotifications;
                        sourceTree = "<group>";
                };

+               EBB0314122223786007241CB /* Tests */ = {
+                       isa = PBXGroup;
+                       children = (
+                               EBB03155222237A7007241CB /* CKKSLaunchSequenceTests.m */,
+                       );
+                       path = Tests;
+                       sourceTree = "<group>";
+               };

                EBC73F44209A0BB200AE3350 /* xcscripts */ = {
                        isa = PBXGroup;
                        children = (
                EBC73F44209A0BB200AE3350 /* xcscripts */ = {
                        isa = PBXGroup;
                        children = (


@@ -21765,6 +25845,15 @@
                        name = secitemfunctionality;
                        sourceTree = "<group>";
                };
                        name = secitemfunctionality;
                        sourceTree = "<group>";
                };

+               EBDAF14021C75FC800EAE89F /* SharedMocks */ = {
+                       isa = PBXGroup;
+                       children = (
+                               EBDAF15B21C75FF200EAE89F /* NSXPCConnectionMock.h */,
+                               EBDAF15C21C75FF200EAE89F /* NSXPCConnectionMock.m */,
+                       );
+                       path = SharedMocks;
+                       sourceTree = "<group>";
+               };

                EBF374731DC055590065D840 /* security-sysdiagnose */ = {
                        isa = PBXGroup;
                        children = (
                EBF374731DC055590065D840 /* security-sysdiagnose */ = {
                        isa = PBXGroup;
                        children = (


@@ -21793,17 +25882,25 @@
                        name = authdtests;
                        sourceTree = "<group>";
                };
                        name = authdtests;
                        sourceTree = "<group>";
                };

-               F93C49391AB8FF530047E01A /* ckcdiagnose */ = {
-                       isa = PBXGroup;
-                       children = (
-                               F93C493A1AB8FF530047E01A /* ckcdiagnose.sh */,
-                       );
-                       path = ckcdiagnose;
-                       sourceTree = "<group>";
-               };

 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */

+               0CD743A123C3EC8000FA0EC5 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C468FE323C7D487006F4582 /* OTEscrowRecordMetadata.h in Headers */,
+                               0C468FF523C7D4D5006F4582 /* OTICDPRecordSilentContext.h in Headers */,
+                               0CD743AA23C3EC8000FA0EC5 /* OctagonTrust.h in Headers */,
+                               0C468FF323C7D4D5006F4582 /* OTICDPRecordContext.h in Headers */,
+                               0C468FE523C7D487006F4582 /* OTEscrowRecordMetadataClientMetadata.h in Headers */,
+                               0C468FEF23C7D4D5006F4582 /* OTCDPRecoveryInformation.h in Headers */,
+                               0C468FE123C7D487006F4582 /* OTEscrowRecord.h in Headers */,
+                               0C468FF123C7D4D5006F4582 /* OTEscrowAuthenticationInformation.h in Headers */,
+                               0C9F65AD23E3AD2E00B1A2C5 /* OTEscrowTranslation.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                225394B01E3080A600D3CD9B /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                225394B01E3080A600D3CD9B /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -21831,7 +25928,6 @@
                                4718AEA2205B39C40068EC3F /* CKKSGroupOperation.h in Headers */,
                                4718AEA3205B39C40068EC3F /* CKKSRateLimiter.h in Headers */,
                                4718AEA4205B39C40068EC3F /* SecDbKeychainSerializedItemV7.h in Headers */,
                                4718AEA2205B39C40068EC3F /* CKKSGroupOperation.h in Headers */,
                                4718AEA3205B39C40068EC3F /* CKKSRateLimiter.h in Headers */,
                                4718AEA4205B39C40068EC3F /* SecDbKeychainSerializedItemV7.h in Headers */,

-                               4718AEA5205B39C40068EC3F /* OTCloudStore.h in Headers */,

                                4718AEA6205B39C40068EC3F /* CKKSResultOperation.h in Headers */,
                                4718AEA7205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                4718AEA8205B39C40068EC3F /* CKKSViewManager.h in Headers */,
                                4718AEA6205B39C40068EC3F /* CKKSResultOperation.h in Headers */,
                                4718AEA7205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                4718AEA8205B39C40068EC3F /* CKKSViewManager.h in Headers */,


@@ -21849,16 +25945,16 @@
                                4718AEB4205B39C40068EC3F /* CKKSMirrorEntry.h in Headers */,
                                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */,
                                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */,
                                4718AEB4205B39C40068EC3F /* CKKSMirrorEntry.h in Headers */,
                                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */,
                                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */,

-                               4718AEB7205B39C40068EC3F /* OTAuthenticatedCiphertext+SF.h in Headers */,
-                               4718AEB8205B39C40068EC3F /* CKKSCKAccountStateTracker.h in Headers */,
+                               4718AEB8205B39C40068EC3F /* CKKSAccountStateTracker.h in Headers */,
+                               6C6AF183221A07240091CE0A /* SecDbKeychainSerializedMetadataKey.h in Headers */,

                                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */,
                                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */,

-                               4718AEBA205B39C40068EC3F /* CKKSTLKShare.h in Headers */,
+                               DC5A01E921BB428500D87AB9 /* CKKSTLKShare.h in Headers */,
+                               4718AEBA205B39C40068EC3F /* CKKSTLKShareRecord.h in Headers */,

                                4718AEBB205B39C40068EC3F /* SecItemDataSource.h in Headers */,
                                4718AEBC205B39C40068EC3F /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,
                                4718AEBD205B39C40068EC3F /* SecDbKeychainSerializedMetadata.h in Headers */,
                                4718AEBE205B39C40068EC3F /* CKKSZoneChangeFetcher.h in Headers */,
                                4718AEBF205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,
                                4718AEBB205B39C40068EC3F /* SecItemDataSource.h in Headers */,
                                4718AEBC205B39C40068EC3F /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,
                                4718AEBD205B39C40068EC3F /* SecDbKeychainSerializedMetadata.h in Headers */,
                                4718AEBE205B39C40068EC3F /* CKKSZoneChangeFetcher.h in Headers */,
                                4718AEBF205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,

-                               4718AEC0205B39C40068EC3F /* SFPublicKey+SPKI.h in Headers */,

                                4718AEC1205B39C40068EC3F /* CKKSIncomingQueueEntry.h in Headers */,
                                4718AEC2205B39C40068EC3F /* SecItemDb.h in Headers */,
                                4718AEC3205B39C40068EC3F /* CKKSFixups.h in Headers */,
                                4718AEC1205B39C40068EC3F /* CKKSIncomingQueueEntry.h in Headers */,
                                4718AEC2205B39C40068EC3F /* SecItemDb.h in Headers */,
                                4718AEC3205B39C40068EC3F /* CKKSFixups.h in Headers */,


@@ -21876,8 +25972,7 @@
                                4718AECF205B39C40068EC3F /* OTManager.h in Headers */,
                                4718AED0205B39C40068EC3F /* CKKSHealTLKSharesOperation.h in Headers */,
                                4718AED1205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,
                                4718AECF205B39C40068EC3F /* OTManager.h in Headers */,
                                4718AED0205B39C40068EC3F /* CKKSHealTLKSharesOperation.h in Headers */,
                                4718AED1205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,

-                               4718AED2205B39C40068EC3F /* OTControlProtocol.h in Headers */,
-                               4718AED3205B39C40068EC3F /* CKKSAPSReceiver.h in Headers */,
+                               4718AED3205B39C40068EC3F /* OctagonAPSReceiver.h in Headers */,

                                4718AED4205B39C40068EC3F /* NSOperationCategories.h in Headers */,
                                4718AED5205B39C40068EC3F /* CKKSKey.h in Headers */,
                                4718AED6205B39C40068EC3F /* CKKSCurrentItemPointer.h in Headers */,
                                4718AED4205B39C40068EC3F /* NSOperationCategories.h in Headers */,
                                4718AED5205B39C40068EC3F /* CKKSKey.h in Headers */,
                                4718AED6205B39C40068EC3F /* CKKSCurrentItemPointer.h in Headers */,


@@ -21893,139 +25988,170 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               1B2BD395235E050E009A8624 /* SecEC-tapi.h in Headers */,

                                4C32C1030A4976BF002891BD /* certextensions.h in Headers */,
                                4C32C1240A4976BF002891BD /* SecBase.h in Headers */,
                                4C32C1250A4976BF002891BD /* SecCertificate.h in Headers */,
                                4C32C1260A4976BF002891BD /* SecTrust.h in Headers */,
                                4C32C1030A4976BF002891BD /* certextensions.h in Headers */,
                                4C32C1240A4976BF002891BD /* SecBase.h in Headers */,
                                4C32C1250A4976BF002891BD /* SecCertificate.h in Headers */,
                                4C32C1260A4976BF002891BD /* SecTrust.h in Headers */,

+                               EB973651234E8F4B00518B2B /* CKKSPBFileStorage.h in Headers */,

                                4CF0484C0A5D988F00268236 /* SecItem.h in Headers */,
                                6CE3654F1FA100F10012F6AB /* SFAnalyticsDefines.h in Headers */,
                                4CF0484C0A5D988F00268236 /* SecItem.h in Headers */,
                                6CE3654F1FA100F10012F6AB /* SFAnalyticsDefines.h in Headers */,

+                               D4707A292113EF68005BCFDA /* SecCmsMessage.h in Headers */,

                                4CF048800A5F016300268236 /* SecItemPriv.h in Headers */,
                                4CF048800A5F016300268236 /* SecItemPriv.h in Headers */,

+                               D4B68C66211A8186009FED69 /* trustd_spi.h in Headers */,

                                4C999BA60AB5F0BB0010451D /* NtlmGenerator.h in Headers */,
                                4C999BA60AB5F0BB0010451D /* NtlmGenerator.h in Headers */,

+                               5AE4BEEF1FA79456001B9DA4 /* SecProtocolObject.h in Headers */,

                                4C999BA80AB5F0BB0010451D /* ntlmBlobPriv.h in Headers */,
                                EB5E3BCC2003C67A00F1631B /* SecSignpost.h in Headers */,
                                4C999BA80AB5F0BB0010451D /* ntlmBlobPriv.h in Headers */,
                                EB5E3BCC2003C67A00F1631B /* SecSignpost.h in Headers */,

-                               09A3B9D81F8267BB00C5C324 /* SecKeyProxy.h in Headers */,
+                               4791B46C2118BD0A00977C3F /* SecXPCError.h in Headers */,
+                               D4707A1121137719005BCFDA /* CMSDecoder.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 */,
                                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 */,

-                               5A4E381B207529670047F40F /* SecProtocol.h in Headers */,

                                6CC952491FB4CB2D0051A823 /* SFAnalytics+Internal.h in Headers */,
                                6CC952491FB4CB2D0051A823 /* SFAnalytics+Internal.h in Headers */,

+                               DCA9D84121FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */,

                                DC3C73541D837B1900F6A832 /* SOSCloudCircle.h in Headers */,
                                524492941AFD6D480043695A /* der_plist.h in Headers */,
                                DC3C73531D837AF800F6A832 /* SOSPeerInfo.h in Headers */,
                                DC3C73541D837B1900F6A832 /* SOSCloudCircle.h in Headers */,
                                524492941AFD6D480043695A /* der_plist.h in Headers */,
                                DC3C73531D837AF800F6A832 /* SOSPeerInfo.h in Headers */,

+                               D47079F321128C74005BCFDA /* SecCMS.h in Headers */,
+                               A6BC648824897C5E00A21CD7 /* CSCommonPriv.h in Headers */,

                                4C12828D0BB4957D00985BB0 /* SecTrustSettingsPriv.h in Headers */,
                                DCD45355209A5B260086CBFC /* si-cms-signing-identity-p12.h in Headers */,
                                4C12828D0BB4957D00985BB0 /* SecTrustSettingsPriv.h in Headers */,
                                DCD45355209A5B260086CBFC /* si-cms-signing-identity-p12.h in Headers */,

+                               1BE85ED5235CEC250051E1D8 /* sslDeprecated.h in Headers */,

                                CDDE9BD11729ABFA0013B0E8 /* SecPasswordGenerate.h in Headers */,
                                4C7072860AC9EA4F007CC205 /* SecKey.h in Headers */,
                                CDDE9BD11729ABFA0013B0E8 /* SecPasswordGenerate.h in Headers */,
                                4C7072860AC9EA4F007CC205 /* SecKey.h in Headers */,

+                               0CD743BB23C3EF1D00FA0EC5 /* OTClique+Private.h in Headers */,
+                               D4B3B1CC2115150D00A43409 /* SecCmsDigestedData.h in Headers */,

                                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */,
                                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */,

+                               D47079FB211355C9005BCFDA /* CMSEncoder.h in Headers */,

                                4C7072D40AC9ED5A007CC205 /* SecKeyPriv.h in Headers */,
                                4C7072D40AC9ED5A007CC205 /* SecKeyPriv.h in Headers */,

+                               D43718C821168D7D00EA350A /* SecSMIME.h in Headers */,

                                DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */,
                                DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */,

+                               4791B4652118BBFF00977C3F /* OTControlProtocol.h in Headers */,

                                4C7073CA0ACB2BAD007CC205 /* SecRSAKey.h in Headers */,
                                4C7073CA0ACB2BAD007CC205 /* SecRSAKey.h in Headers */,

+                               A6BC6491248B0AB400A21CD7 /* SecStaticCodePriv.h in Headers */,

                                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */,
                                4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */,
                                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */,
                                4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */,

+                               EBF252222155E910000204D6 /* OTJoiningConfiguration.h in Headers */,

                                4C7391790B01745000C4CBFA /* vmdh.h in Headers */,
                                6CDB5FFB1FA78D2C00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                4C64E01C0B8FBC71009B306C /* SecIdentity.h in Headers */,
                                4C64E01D0B8FBC7E009B306C /* Security.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 */,
                                4CBA0E880BB33C0000E72B55 /* SecPolicy.h in Headers */,
                                E7676DB619411DF300498DD4 /* SecServerEncryptionSupport.h in Headers */,
                                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */,
                                4C4296320BB0A68200491999 /* SecTrustSettings.h in Headers */,
                                4CBA0E880BB33C0000E72B55 /* SecPolicy.h in Headers */,

+                               D4B3B1D52115195900A43409 /* SecCmsRecipientInfo.h in Headers */,

                                4C6416D50BB34F00001C83FD /* SecPolicyPriv.h in Headers */,
                                78F92F11195128D70023B54B /* SecECKeyPriv.h in Headers */,
                                4CD3BA621106FF4D00BE8B75 /* SecECKey.h in Headers */,
                                4C6416F10BB357D5001C83FD /* SecInternal.h in Headers */,
                                4C6416D50BB34F00001C83FD /* SecPolicyPriv.h in Headers */,
                                78F92F11195128D70023B54B /* SecECKeyPriv.h in Headers */,
                                4CD3BA621106FF4D00BE8B75 /* SecECKey.h in Headers */,
                                4C6416F10BB357D5001C83FD /* SecInternal.h in Headers */,

+                               5A6D1B9D20810EF40057CAC8 /* SecProtocolTypes.h in Headers */,

                                443381ED18A3D83100215606 /* SecAccessControl.h in Headers */,
                                443381ED18A3D83100215606 /* SecAccessControl.h in Headers */,

-                               5AFCF32E20746DA70010D4B5 /* SecProtocolObject.h in Headers */,

                                4723C9C61F152EC00082882F /* SFSQLite.h in Headers */,
                                4C1B442D0BB9CAF900461B82 /* SecTrustStore.h in Headers */,
                                DC3C7AB81D838C6F00F6A832 /* oidsalg.h in Headers */,
                                B61F67561F1FCFCA00E2FDBB /* SecPaddingConfigurationsPriv.h in Headers */,
                                4C2F81D50BF121D2003C4F77 /* SecRandom.h in Headers */,
                                4723C9C61F152EC00082882F /* SFSQLite.h in Headers */,
                                4C1B442D0BB9CAF900461B82 /* SecTrustStore.h in Headers */,
                                DC3C7AB81D838C6F00F6A832 /* oidsalg.h in Headers */,
                                B61F67561F1FCFCA00E2FDBB /* SecPaddingConfigurationsPriv.h in Headers */,
                                4C2F81D50BF121D2003C4F77 /* SecRandom.h in Headers */,

+                               0CD9E34323592DD7002995DE /* OctagonSignPosts.h in Headers */,

                                ACBAF6EE1E941AE00007BA2F /* transform_regressions.h in Headers */,
                                7940D4130C3ACF9000FDB5D8 /* SecDH.h in Headers */,
                                ACBAF6EE1E941AE00007BA2F /* transform_regressions.h in Headers */,
                                7940D4130C3ACF9000FDB5D8 /* SecDH.h in Headers */,

-                               DCC5860320BF8A98005C7269 /* SecBase.h in Headers */,
+                               478014791FBF5D2000C4043D /* SecKeyProxy.h in Headers */,

                                790850F70CA88AE10083CC4D /* securityd_client.h in Headers */,
                                790850F70CA88AE10083CC4D /* securityd_client.h in Headers */,

+                               1BE85ECF235CEB620051E1D8 /* cms-tapi.h in Headers */,

                                795CA9CE0D38435E00BAE6A2 /* p12pbegen.h in Headers */,
                                795CA9CE0D38435E00BAE6A2 /* p12pbegen.h in Headers */,

+                               D4B3B1CF211516A000A43409 /* SecCmsEncryptedData.h in Headers */,

                                79EF5B730D3D6AFE009F5270 /* p12import.h in Headers */,
                                4723C9C21F152EB50082882F /* SFObjCType.h in Headers */,
                                79EF5B730D3D6AFE009F5270 /* p12import.h in Headers */,
                                4723C9C21F152EB50082882F /* SFObjCType.h in Headers */,

+                               0C0582C620D9CA4800D7BD7A /* OTClique.h in Headers */,
+                               DC0C343821FA7DEB00417D04 /* SecEscrowRequest.h in Headers */,

                                4CE7EA791AEAF39C0067F5BD /* SecItemBackup.h in Headers */,
                                222F23A01DAC1603007ACB90 /* SecTaskPriv.h in Headers */,
                                4CE7EA791AEAF39C0067F5BD /* SecItemBackup.h in Headers */,
                                222F23A01DAC1603007ACB90 /* SecTaskPriv.h in Headers */,

-                               5AFCF32B20746BC80010D4B5 /* SecProtocolMetadata.h in Headers */,

                                DC3C7AB51D838C1300F6A832 /* SecAsn1Templates.h in Headers */,
                                6CE365511FA100FE0012F6AB /* SFAnalyticsSampler.h in Headers */,
                                79EF5B6E0D3D6A31009F5270 /* SecImportExport.h in Headers */,
                                DC3C7AB51D838C1300F6A832 /* SecAsn1Templates.h in Headers */,
                                6CE365511FA100FE0012F6AB /* SFAnalyticsSampler.h in Headers */,
                                79EF5B6E0D3D6A31009F5270 /* SecImportExport.h in Headers */,

+                               DC372C8E22B4509100AB9F41 /* SecCoreAnalytics.h in Headers */,

                                4723C9CA1F152ECE0082882F /* SFSQLiteStatement.h in Headers */,
                                4723C9CA1F152ECE0082882F /* SFSQLiteStatement.h in Headers */,

-                               5AFCF32920746BC20010D4B5 /* SecProtocolOptions.h in Headers */,
+                               5A6D1B9B20810EDD0057CAC8 /* SecProtocolOptions.h in Headers */,

                                4CCE0ADA0D41797400DDBB21 /* SecIdentityPriv.h in Headers */,
                                4CCE0ADE0D4179E500DDBB21 /* SecBasePriv.h in Headers */,
                                DCD7EE991F4F4E03007D9804 /* ocspTemplates.h in Headers */,
                                4C87F3A80D611C26000E7104 /* SecTrustPriv.h in Headers */,
                                4CCE0ADA0D41797400DDBB21 /* SecIdentityPriv.h in Headers */,
                                4CCE0ADE0D4179E500DDBB21 /* SecBasePriv.h in Headers */,
                                DCD7EE991F4F4E03007D9804 /* ocspTemplates.h in Headers */,
                                4C87F3A80D611C26000E7104 /* SecTrustPriv.h in Headers */,

-                               79BDD3C20D60DB84000D84D3 /* SecCMS.h in Headers */,
-                               5AC6BFAB2077CD310051737D /* SecProtocolTypes.h in Headers */,

                                DC2C5F4B1F0D935200FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                107226D30D91DB32003CF14F /* SecTask.h in Headers */,
                                4C7CE5700DC7DC6600AE53FC /* SecEntitlements.h in Headers */,
                                DC2C5F4B1F0D935200FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                107226D30D91DB32003CF14F /* SecTask.h in Headers */,
                                4C7CE5700DC7DC6600AE53FC /* SecEntitlements.h in Headers */,

+                               1BE85ED2235CEBB40051E1D8 /* secport-tapi.h in Headers */,

                                6CE365551FA101730012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                791766DE0DD0162C00F3B974 /* SecCertificateRequest.h in Headers */,
                                4C7416040F1D71A2008E0E4D /* SecSCEP.h in Headers */,
                                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */,
                                6CE365551FA101730012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                791766DE0DD0162C00F3B974 /* SecCertificateRequest.h in Headers */,
                                4C7416040F1D71A2008E0E4D /* SecSCEP.h in Headers */,
                                DC3C72E21D8374D600F6A832 /* SecureTransportPriv.h in Headers */,

+                               1F631C5422387F27005920D8 /* legacydevid.h in Headers */,

                                4AF7FFFD15AFB73800B9D400 /* SecOTR.h in Headers */,
                                4AF7FFFD15AFB73800B9D400 /* SecOTR.h in Headers */,

+                               5A7E037B2227301D003DB3A0 /* SecProtocolInternal.h in Headers */,

                                DC3C7AB21D838B6D00F6A832 /* SecureTransport.h in Headers */,
                                6CBF65391FA147E500A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                4AF7FFFE15AFB73800B9D400 /* SecOTRDHKey.h in Headers */,
                                DC3C7AB21D838B6D00F6A832 /* SecureTransport.h in Headers */,
                                6CBF65391FA147E500A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                4AF7FFFE15AFB73800B9D400 /* SecOTRDHKey.h in Headers */,

+                               D4B3B1DB21152AD200A43409 /* SecCmsSignerInfo.h in Headers */,

                                DCFE9C8920EC1F3B00EB6BAC /* SOSControlHelper.h in Headers */,
                                4AF7FFFF15AFB73800B9D400 /* SecOTRErrors.h in Headers */,
                                6C73F48F2006B910003D5D63 /* SOSAnalytics.h in Headers */,
                                DCD7EE9A1F4F5156007D9804 /* oidsocsp.h in Headers */,
                                DCFE9C8920EC1F3B00EB6BAC /* SOSControlHelper.h in Headers */,
                                4AF7FFFF15AFB73800B9D400 /* SecOTRErrors.h in Headers */,
                                6C73F48F2006B910003D5D63 /* SOSAnalytics.h in Headers */,
                                DCD7EE9A1F4F5156007D9804 /* oidsocsp.h in Headers */,

-                               BE2AD2B31FDA07EF00739F96 /* OTBottledPeerRecord.h in Headers */,
+                               D4B3B1D821151BBF00A43409 /* SecCmsSignedData.h in Headers */,

                                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */,
                                4AF7000315AFB73800B9D400 /* SecOTRPacketData.h in Headers */,
                                4AF7000115AFB73800B9D400 /* SecOTRMath.h in Headers */,
                                4AF7000315AFB73800B9D400 /* SecOTRPacketData.h in Headers */,

+                               D4707A232113E74B005BCFDA /* SecCmsEncoder.h in Headers */,
+                               D4B3B1D2211517BC00A43409 /* SecCmsEnvelopedData.h in Headers */,
+                               D4707A0E211373DB005BCFDA /* CMSPrivate.h in Headers */,
+                               EB74CC1F2207E4BA00F1BBAD /* KeychainSettings.h in Headers */,
+                               D4707A2F2114C315005BCFDA /* SecCmsDigestContext.h in Headers */,

                                DC3C7AB31D838BC300F6A832 /* CipherSuite.h in Headers */,
                                6C814A4C2050B4B600CB391B /* LocalKeychainAnalytics.h in Headers */,
                                4AF7000415AFB73800B9D400 /* SecOTRPackets.h in Headers */,
                                6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                DC3C7AB31D838BC300F6A832 /* CipherSuite.h in Headers */,
                                6C814A4C2050B4B600CB391B /* LocalKeychainAnalytics.h in Headers */,
                                4AF7000415AFB73800B9D400 /* SecOTRPackets.h in Headers */,
                                6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,

+                               D4707A262113EBC1005BCFDA /* SecCmsDecoder.h in Headers */,

                                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */,
                                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */,

+                               6C06CB902408602900025303 /* SecItemInternal.h in Headers */,

                                6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */,
                                6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */,

+                               5A442FA6233C34FE00918373 /* SecExperimentInternal.h in Headers */,

                                4AF7000515AFB73800B9D400 /* SecOTRSession.h in Headers */,
                                4AF7000515AFB73800B9D400 /* SecOTRSession.h in Headers */,

+                               D4707A2C2114C1E5005BCFDA /* SecCmsContentInfo.h in Headers */,

                                D487B9821DFA28DB000410A1 /* SecInternalReleasePriv.h in Headers */,
                                4AF7000615AFB73800B9D400 /* SecOTRSessionPriv.h in Headers */,
                                EB69AB301BF4348000913AF1 /* SecEMCSPriv.h in Headers */,
                                D487B9821DFA28DB000410A1 /* SecInternalReleasePriv.h in Headers */,
                                4AF7000615AFB73800B9D400 /* SecOTRSessionPriv.h in Headers */,
                                EB69AB301BF4348000913AF1 /* SecEMCSPriv.h in Headers */,

+                               DCA143341FE0802C00A40D59 /* OTControl.h in Headers */,

                                D47F514C1C3B812500A7CEFE /* SecCFAllocator.h in Headers */,
                                D47F514C1C3B812500A7CEFE /* SecCFAllocator.h in Headers */,

-                               BEB0B0DB1FFC45C2007E6A83 /* OTPrivateKey+SF.h in Headers */,
+                               D46CD4C72267949C00E2C4D7 /* certExtensionTemplates.h in Headers */,
+                               D46CD4C82267949C00E2C4D7 /* nameTemplates.h in Headers */,
+                               D46CD4C92267949C00E2C4D7 /* X509Templates.h in Headers */,
+                               5A442FA5233C34FE00918373 /* SecExperimentPriv.h in Headers */,

                                8E02FA6B1107BE460043545E /* pbkdf2.h in Headers */,
                                8E02FA6B1107BE460043545E /* pbkdf2.h in Headers */,

+                               AA7C71B62185429800EB314F /* SecProtocolTypesPriv.h in Headers */,

                                8ED6F6CA110904E300D2B368 /* SecPBKDF.h in Headers */,
                                8ED6F6CA110904E300D2B368 /* SecPBKDF.h in Headers */,

-                               7901791812D51F7200CA4D44 /* SecCmsBase.h in Headers */,
-                               D4FBBD631DD661AD004408F7 /* CMSDecoder.h in Headers */,
-                               D4FBBD621DD661A7004408F7 /* CMSEncoder.h in Headers */,
+                               1B2BD396235E050E009A8624 /* SecPolicy-tapi.h in Headers */,
+                               5F00F95B230614AC00B832E0 /* SecImportExportPriv.h in Headers */,

                                22A23B3A1E3AAC9800C41830 /* CodeSigning.h in Headers */,
                                22A23B3A1E3AAC9800C41830 /* CodeSigning.h in Headers */,

+                               5A6D1B9520810EAD0057CAC8 /* SecProtocolMetadata.h in Headers */,
+                               5AF594021FA1051600A5C1EC /* SecProtocolPriv.h in Headers */,

                                22A23B3B1E3AAC9800C41830 /* CSCommon.h in Headers */,
                                22A23B3C1E3AAC9800C41830 /* SecCode.h in Headers */,
                                22A23B3B1E3AAC9800C41830 /* CSCommon.h in Headers */,
                                22A23B3C1E3AAC9800C41830 /* SecCode.h in Headers */,

+                               EBDAF15D21C75FF200EAE89F /* NSXPCConnectionMock.h in Headers */,

                                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */,
                                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */,

-                               724340BA1ED3FEC800F8F566 /* SecSMIME.h in Headers */,

                                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */,
                                DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */,
                                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */,
                                DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */,

-                               0CBFEACC200FCD33009A60E9 /* SFSignInAnalytics.h in Headers */,

                                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */,
                                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */,

+                               1B2BD397235E050E009A8624 /* Security-tapi.h in Headers */,

                                D43D8B2D20AB8A54005BEEC4 /* Security.apinotes in Headers */,
                                DC3C73551D837B2C00F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                D43D8B2D20AB8A54005BEEC4 /* Security.apinotes in Headers */,
                                DC3C73551D837B2C00F6A832 /* SOSPeerInfoPriv.h in Headers */,

-                               AA44E0DE2032519E001EA371 /* SecProtocolPriv.h in Headers */,

                                D46246A31F9AE59E00D63882 /* oids.h in Headers */,
                                DCD7EEA41F4F58D7007D9804 /* SecLogging.h in Headers */,
                                D46246A31F9AE59E00D63882 /* oids.h in Headers */,
                                DCD7EEA41F4F58D7007D9804 /* SecLogging.h in Headers */,

+                               AA5B12192164671000A6AB81 /* SecProtocolConfiguration.h in Headers */,
+                               D4707A202113AC33005BCFDA /* SecCmsBase.h in Headers */,

                                47A05B161FDB5D9E00D0816E /* SFKeychainControl.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 */,
-                               7901792012D51F7200CA4D44 /* SecCmsSignedData.h in Headers */,
-                               7901792112D51F7200CA4D44 /* SecCmsSignerInfo.h in Headers */,
+                               0C5258BD21BB137900B32C96 /* FakeSOSControl.h in Headers */,

                                DC3C7AB71D838C5C00F6A832 /* secasn1t.h in Headers */,
                                DC3C7AB71D838C5C00F6A832 /* secasn1t.h in Headers */,

+                               5A04BB1922986717001848A0 /* SecXPCHelper.h in Headers */,

                                DC3C7AB41D838BEB00F6A832 /* SecAsn1Coder.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DC3C7AB41D838BEB00F6A832 /* SecAsn1Coder.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -22042,23 +26168,89 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               BEF88C911EB000BE00357577 /* TPVoucher.h in Headers */,
-                               BEF88C8D1EB000BE00357577 /* TPSigningKey.h in Headers */,
+                               6C32D36420F2C23100ACAB2C /* TPPBPolicyRedaction.h in Headers */,
+                               BEF88C8D1EB000BE00357577 /* TPKey.h in Headers */,
+                               6C32D36720F2C23D00ACAB2C /* TPPBPolicyIntroducersByCategory.h in Headers */,

                                BEF88C7D1EB000BE00357577 /* TPHash.h in Headers */,
                                BEF88C7C1EB000BE00357577 /* TPEncrypter.h in Headers */,
                                BEF88C8B1EB000BE00357577 /* TPPolicyDocument.h in Headers */,
                                BEF88C7D1EB000BE00357577 /* TPHash.h in Headers */,
                                BEF88C7C1EB000BE00357577 /* TPEncrypter.h in Headers */,
                                BEF88C8B1EB000BE00357577 /* TPPolicyDocument.h in Headers */,

-                               BEF88C8F1EB000BE00357577 /* TPUtils.h in Headers */,
+                               DC2B9A5223147A3800D4C79D /* TPMachineID.h in Headers */,
+                               BEC373CB20D822DA00DBDF5B /* TPPBDispositionEntry.h in Headers */,

                                BEF88C7F1EB000BE00357577 /* TPModel.h in Headers */,
                                BEF88C7F1EB000BE00357577 /* TPModel.h in Headers */,

-                               BEF88C791EB000BE00357577 /* TPCircle.h in Headers */,

                                BE61F5AF1EB0060C00556CCF /* TrustedPeers.h in Headers */,
                                BE61F5AF1EB0060C00556CCF /* TrustedPeers.h in Headers */,

+                               DCC03FA423FF521100A4DA3F /* TPSyncingPolicy.h in Headers */,

                                BEF88C891EB000BE00357577 /* TPPolicy.h in Headers */,
                                BEF88C871EB000BE00357577 /* TPPeerStableInfo.h in Headers */,
                                BEF88C7B1EB000BE00357577 /* TPDecrypter.h in Headers */,
                                BEF88C891EB000BE00357577 /* TPPolicy.h in Headers */,
                                BEF88C871EB000BE00357577 /* TPPeerStableInfo.h in Headers */,
                                BEF88C7B1EB000BE00357577 /* TPDecrypter.h in Headers */,

+                               DCF458B4221F6A90007F5507 /* TPLog.h in Headers */,

                                BEF88C771EB000BE00357577 /* TPCategoryRule.h in Headers */,
                                BEF88C771EB000BE00357577 /* TPCategoryRule.h in Headers */,

+                               DC730E20224012770051DD48 /* TPPBDictionaryMatchingRuleFieldExists.h in Headers */,

                                BEF88C8E1EB000BE00357577 /* TPTypes.h in Headers */,
                                BEF88C8E1EB000BE00357577 /* TPTypes.h in Headers */,

+                               DCD7DDA022B86A5500161396 /* TPPBDispositionDuplicateMachineID.h in Headers */,

                                BEF88C811EB000BE00357577 /* TPPeer.h in Headers */,
                                BEF88C811EB000BE00357577 /* TPPeer.h in Headers */,

+                               DA700FC92310C0E00051A7DE /* TPStringTable.h in Headers */,
+                               BEC373B220D815F500DBDF5B /* TPPBUnknownMachineID.h in Headers */,
+                               DC730E1322400D7B0051DD48 /* TPDictionaryMatchingRules.h in Headers */,
+                               BEB49F30206E98D0008DA7F4 /* TPECPublicKeyFactory.h in Headers */,

                                BEF88C831EB000BE00357577 /* TPPeerDynamicInfo.h in Headers */,
                                BEF88C831EB000BE00357577 /* TPPeerDynamicInfo.h in Headers */,

+                               6C32D36820F2C23D00ACAB2C /* TPPBPolicyModelToCategory.h in Headers */,
+                               BEB49F34206E9A1A008DA7F4 /* SFKey+TPKey.h in Headers */,

                                BEF88C851EB000BE00357577 /* TPPeerPermanentInfo.h in Headers */,
                                BEF88C851EB000BE00357577 /* TPPeerPermanentInfo.h in Headers */,

+                               BEB0B06E1FE9E81D007E6A83 /* TPPBPeerDynamicInfo.h in Headers */,
+                               6C32D36620F2C23D00ACAB2C /* TPPBPolicyCategoriesByView.h in Headers */,
+                               BEC373B320D815FB00DBDF5B /* TPPBPolicyProhibits.h in Headers */,
+                               DC730E212240127D0051DD48 /* TPPBDictionaryMatchingRule.h in Headers */,
+                               BEC373A420CF3B5D00DBDF5B /* TPPBDisposition.h in Headers */,
+                               1B4C444B223AE65500C6F97F /* TPPBPolicyKeyViewMapping.h in Headers */,
+                               DCAD8F8C22C55D76007C3872 /* TPPBDispositionDisallowedMachineID.h in Headers */,
+                               BEC373B420D8160100DBDF5B /* TPPBAncientEpoch.h in Headers */,
+                               BEB0B06F1FE9E850007E6A83 /* TPPBPeerPermanentInfo.h in Headers */,
+                               BECEC11220A508F600E97255 /* TPVoucher.h in Headers */,
+                               BE70899D1F9AB03E001ACC20 /* TPPBVoucher.h in Headers */,
+                               DC730E1F224012710051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.h in Headers */,
+                               BEB0B0701FE9E8F6007E6A83 /* TPPBPeerStableInfo.h in Headers */,
+                               6C32D36520F2C23D00ACAB2C /* TPPBPolicyDocument.h in Headers */,
+                               BEB0B0711FE9E936007E6A83 /* TPPBPolicySecret.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D42C839421159146008D3D83 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D43718AC2116839300EA350A /* SecSMIMEPriv.h in Headers */,
+                               D43718B9211683D400EA350A /* tsaTemplates.h in Headers */,
+                               D437187E2116831A00EA350A /* cmslocal.h in Headers */,
+                               D43718A92116839300EA350A /* secoidt.h in Headers */,
+                               D43718A02116836300EA350A /* secitem.h in Headers */,
+                               D43718892116834400EA350A /* cmsreclist.h in Headers */,
+                               D437189D2116836300EA350A /* plhash.h in Headers */,
+                               D43718AB2116839300EA350A /* secoid.h in Headers */,
+                               D437188D2116834400EA350A /* cmstpriv.h in Headers */,
+                               D43718B6211683D400EA350A /* tsaSupportPriv.h in Headers */,
+                               D437186F211682D800EA350A /* cert.h in Headers */,
+                               D437189A2116836300EA350A /* cryptohi.h in Headers */,
+                               D43718B7211683D400EA350A /* tsaSupport.h in Headers */,
+                               D437188A2116834400EA350A /* cmspriv.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D44D1F622115893000E76E1A /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4D1FDC921163F6A003538E2 /* SecCmsDecoder.h in Headers */,
+                               D4D1FDCB21163F6A003538E2 /* SecCmsDigestedData.h in Headers */,
+                               D4D1FDC821163F6A003538E2 /* SecCmsContentInfo.h in Headers */,
+                               D4D1FDCA21163F6A003538E2 /* SecCmsDigestContext.h in Headers */,
+                               D4D1FDD021163F6A003538E2 /* SecCmsRecipientInfo.h in Headers */,
+                               D4D1FDC721163F6A003538E2 /* SecCmsBase.h in Headers */,
+                               D4D1FDCE21163F6A003538E2 /* SecCmsEnvelopedData.h in Headers */,
+                               D4D1FDCF21163F6A003538E2 /* SecCmsMessage.h in Headers */,
+                               D4D1FDD121163F6A003538E2 /* SecCmsSignedData.h in Headers */,
+                               D4D1FDCC21163F6A003538E2 /* SecCmsEncoder.h in Headers */,
+                               D4D1FDD221163F6A003538E2 /* SecCmsSignerInfo.h in Headers */,
+                               D4D1FDCD21163F6A003538E2 /* SecCmsEncryptedData.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -22070,6 +26262,16 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               D4D1FDD821165F8B003538E2 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4371861211671A500EA350A /* cms-01-basic.h in Headers */,
+                               D4D1FDE4211660F4003538E2 /* cms-trust-settings-test.h in Headers */,
+                               D4D1FDE021165FAE003538E2 /* cms_regressions.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC0067951D87876F005AF8DB /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                DC0067951D87876F005AF8DB /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -22084,6 +26286,14 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC05037121409A4000A8EDB7 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DC05037A21409A4100A8EDB7 /* OCMockUmbrella.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC0BC5861D8B70E700070CB0 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                DC0BC5861D8B70E700070CB0 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -22122,10 +26332,8 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC0BC6901D8B755200070CB0 /* giantIntegers.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                DC0BC6901D8B755200070CB0 /* giantIntegers.h in Headers */,

-                               DC0BC6541D8B755200070CB0 /* CipherFileDES.h in Headers */,

                                DC0BC6621D8B755200070CB0 /* ckutilities.h in Headers */,
                                DC0BC65E1D8B755200070CB0 /* ckSHA1.h in Headers */,
                                DC0BC6621D8B755200070CB0 /* ckutilities.h in Headers */,
                                DC0BC65E1D8B755200070CB0 /* ckSHA1.h in Headers */,

-                               DC0BC6921D8B755200070CB0 /* giantPort_i486.h in Headers */,

                                DC0BC6721D8B755200070CB0 /* ellipticMeasure.h in Headers */,
                                DC0BC6711D8B755200070CB0 /* elliptic.h in Headers */,
                                DC0BC66E1D8B755200070CB0 /* ECDSA_Profile.h in Headers */,
                                DC0BC6721D8B755200070CB0 /* ellipticMeasure.h in Headers */,
                                DC0BC6711D8B755200070CB0 /* elliptic.h in Headers */,
                                DC0BC66E1D8B755200070CB0 /* ECDSA_Profile.h in Headers */,


@@ -22138,33 +26346,23 @@
                                DC0BC66D1D8B755200070CB0 /* curveParams.h in Headers */,
                                DC0BC66A1D8B755200070CB0 /* curveParamData.h in Headers */,
                                DC0BC67B1D8B755200070CB0 /* feeDebug.h in Headers */,
                                DC0BC66D1D8B755200070CB0 /* curveParams.h in Headers */,
                                DC0BC66A1D8B755200070CB0 /* curveParamData.h in Headers */,
                                DC0BC67B1D8B755200070CB0 /* feeDebug.h in Headers */,

-                               DC0BC6561D8B755200070CB0 /* CipherFileFEED.h in Headers */,
-                               DC0BC65A1D8B755200070CB0 /* ckDES.h in Headers */,

                                DC0BC6741D8B755200070CB0 /* ellipticProj.h in Headers */,
                                DC0BC6521D8B755200070CB0 /* byteRep.h in Headers */,
                                DC0BC6851D8B755200070CB0 /* feeFEEDExp.h in Headers */,
                                DC0BC6741D8B755200070CB0 /* ellipticProj.h in Headers */,
                                DC0BC6521D8B755200070CB0 /* byteRep.h in Headers */,
                                DC0BC6851D8B755200070CB0 /* feeFEEDExp.h in Headers */,

-                               DC0BC6571D8B755200070CB0 /* CipherFileTypes.h in Headers */,

                                DC0BC6691D8B755200070CB0 /* CryptKitDER.h in Headers */,
                                DC0BC65C1D8B755200070CB0 /* ckMD5.h in Headers */,
                                DC0BC6691D8B755200070CB0 /* CryptKitDER.h in Headers */,
                                DC0BC65C1D8B755200070CB0 /* ckMD5.h in Headers */,

-                               DC0BC66F1D8B755200070CB0 /* ECDSA_Verify_Prefix.h in Headers */,
-                               DC0BC6941D8B755200070CB0 /* giantPort_PPC.h in Headers */,

                                DC0BC6861D8B755200070CB0 /* feeFunctions.h in Headers */,
                                DC0BC68B1D8B755200070CB0 /* feePublicKeyPrivate.h in Headers */,
                                DC0BC68A1D8B755200070CB0 /* feePublicKey.h in Headers */,
                                DC0BC6861D8B755200070CB0 /* feeFunctions.h in Headers */,
                                DC0BC68B1D8B755200070CB0 /* feePublicKeyPrivate.h in Headers */,
                                DC0BC68A1D8B755200070CB0 /* feePublicKey.h in Headers */,

-                               DC0BC66B1D8B755200070CB0 /* curveParamDataOld.h in Headers */,

                                DC0BC68D1D8B755200070CB0 /* feeRandom.h in Headers */,
                                DC0BC6761D8B755200070CB0 /* enc64.h in Headers */,
                                DC0BC68D1D8B755200070CB0 /* feeRandom.h in Headers */,
                                DC0BC6761D8B755200070CB0 /* enc64.h in Headers */,

-                               DC0BC6601D8B755200070CB0 /* ckSHA1_priv.h in Headers */,

                                DC0BC6791D8B755200070CB0 /* falloc.h in Headers */,
                                DC0BC6971D8B755200070CB0 /* giantPortCommon.h in Headers */,
                                DC0BC6791D8B755200070CB0 /* falloc.h in Headers */,
                                DC0BC6971D8B755200070CB0 /* giantPortCommon.h in Headers */,

-                               DC0BC67A1D8B755200070CB0 /* feeCipherFile.h in Headers */,

                                DC0BC6881D8B755200070CB0 /* feeHash.h in Headers */,
                                DC0BC6881D8B755200070CB0 /* feeHash.h in Headers */,

-                               DC0BC67D1D8B755200070CB0 /* feeDES.h in Headers */,

                                DC0BC6911D8B755200070CB0 /* giantPort_Generic.h in Headers */,
                                DC0BC6671D8B755200070CB0 /* CryptKitAsn1.h in Headers */,
                                DC0BC68E1D8B755200070CB0 /* feeTypes.h in Headers */,
                                DC0BC6991D8B755200070CB0 /* HmacSha1Legacy.h in Headers */,
                                DC0BC6911D8B755200070CB0 /* giantPort_Generic.h in Headers */,
                                DC0BC6671D8B755200070CB0 /* CryptKitAsn1.h in Headers */,
                                DC0BC68E1D8B755200070CB0 /* feeTypes.h in Headers */,
                                DC0BC6991D8B755200070CB0 /* HmacSha1Legacy.h in Headers */,

-                               DC0BC6951D8B755200070CB0 /* giantPort_PPC_Gnu.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -22185,6 +26383,7 @@
                                DC0BC7CF1D8B7B7F00070CB0 /* cssmconfig.h in Headers */,
                                DC0BC7DB1D8B7B7F00070CB0 /* oidsbase.h in Headers */,
                                DC0BC7D51D8B7B7F00070CB0 /* cssmspi.h in Headers */,
                                DC0BC7CF1D8B7B7F00070CB0 /* cssmconfig.h in Headers */,
                                DC0BC7DB1D8B7B7F00070CB0 /* oidsbase.h in Headers */,
                                DC0BC7D51D8B7B7F00070CB0 /* cssmspi.h in Headers */,

+                               6C97434824D1C8CB00A2025C /* LegacyAPICounts.h in Headers */,

                                DC0BC7D01D8B7B7F00070CB0 /* cssmcspi.h in Headers */,
                                DC0BC7AD1D8B773000070CB0 /* modload_static.h in Headers */,
                                DC0BC7D21D8B7B7F00070CB0 /* cssmerr.h in Headers */,
                                DC0BC7D01D8B7B7F00070CB0 /* cssmcspi.h in Headers */,
                                DC0BC7AD1D8B773000070CB0 /* modload_static.h in Headers */,
                                DC0BC7D21D8B7B7F00070CB0 /* cssmerr.h in Headers */,


@@ -22454,13 +26653,12 @@
                                DC0BCDB21D8C6A1F00070CB0 /* SecInternalReleasePriv.h in Headers */,
                                DC0BCD831D8C6A1E00070CB0 /* SecCFWrappers.h in Headers */,
                                DC0BCDB01D8C6A1F00070CB0 /* SecAppleAnchorPriv.h in Headers */,
                                DC0BCDB21D8C6A1F00070CB0 /* SecInternalReleasePriv.h in Headers */,
                                DC0BCD831D8C6A1E00070CB0 /* SecCFWrappers.h in Headers */,
                                DC0BCDB01D8C6A1F00070CB0 /* SecAppleAnchorPriv.h in Headers */,

+                               5F4C22002489C6AB00F0C425 /* simulatecrash_assert.h in Headers */,

                                B61577EC1F201562004A3930 /* SecPaddingConfigurationsPriv.h in Headers */,
                                B61577EC1F201562004A3930 /* SecPaddingConfigurationsPriv.h in Headers */,

-                               DC65E7C11D8CBB1500152EF0 /* readline.h in Headers */,
-                               EB4B6E261DC0683600AFC494 /* SecADWrapper.h in Headers */,
+                               DC36895921235F2A003A3735 /* SecAKSWrappers.h in Headers */,

                                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */,
                                72CDF5131EC679A4002D233B /* sec_action.h in Headers */,
                                DC0BCD8F1D8C6A1E00070CB0 /* debugging_test.h in Headers */,
                                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */,
                                72CDF5131EC679A4002D233B /* sec_action.h in Headers */,
                                DC0BCD8F1D8C6A1E00070CB0 /* debugging_test.h in Headers */,

-                               DC0BCD781D8C6A1E00070CB0 /* SecAKSWrappers.h in Headers */,

                                DC0BCDA71D8C6A1F00070CB0 /* SecDb.h in Headers */,
                                DC0BCDA11D8C6A1F00070CB0 /* sqlutils.h in Headers */,
                                DC963EC61D95F646008A153E /* der_plist.h in Headers */,
                                DC0BCDA71D8C6A1F00070CB0 /* SecDb.h in Headers */,
                                DC0BCDA11D8C6A1F00070CB0 /* sqlutils.h in Headers */,
                                DC963EC61D95F646008A153E /* der_plist.h in Headers */,


@@ -22491,16 +26689,19 @@
                                DC1785231D7789AF00B50D50 /* AuthorizationPlugin.h in Headers */,
                                DC17875F1D7790E500B50D50 /* AuthorizationPriv.h in Headers */,
                                DC1785241D7789AF00B50D50 /* AuthorizationTags.h in Headers */,
                                DC1785231D7789AF00B50D50 /* AuthorizationPlugin.h in Headers */,
                                DC17875F1D7790E500B50D50 /* AuthorizationPriv.h in Headers */,
                                DC1785241D7789AF00B50D50 /* AuthorizationTags.h in Headers */,

+                               EBF252252155E911000204D6 /* OTJoiningConfiguration.h in Headers */,

                                EB5E3BCD2003C67B00F1631B /* SecSignpost.h in Headers */,
                                EB5E3BCD2003C67B00F1631B /* SecSignpost.h in Headers */,

+                               0CD9E34423592DD7002995DE /* OctagonSignPosts.h in Headers */,

                                DC1787601D7790E500B50D50 /* AuthorizationTagsPriv.h in Headers */,
                                DC1787601D7790E500B50D50 /* AuthorizationTagsPriv.h in Headers */,

-                               DC1785901D778B9D00B50D50 /* CMSDecoder.h in Headers */,
-                               DC1785911D778B9D00B50D50 /* CMSEncoder.h in Headers */,
+                               D47079FA211355C5005BCFDA /* CMSEncoder.h in Headers */,
+                               AA5B121C2164671000A6AB81 /* SecProtocolConfiguration.h in Headers */,

                                EB10A3FC2035789B00E84270 /* OTConstants.h in Headers */,
                                EB10A3FC2035789B00E84270 /* OTConstants.h in Headers */,

-                               DC1787591D7790B600B50D50 /* CMSPrivate.h in Headers */,

                                DC1785881D778B8000B50D50 /* CSCommon.h in Headers */,
                                DC1785881D778B8000B50D50 /* CSCommon.h in Headers */,

-                               D46A6C09215336BC008ABF6A /* SecFramework.h in Headers */,
+                               D4428B342122604300EB8448 /* SecFramework.h in Headers */,

                                DC17874E1D7790A500B50D50 /* CSCommonPriv.h in Headers */,
                                DC1785A51D778D0D00B50D50 /* CipherSuite.h in Headers */,
                                DC17874E1D7790A500B50D50 /* CSCommonPriv.h in Headers */,
                                DC1785A51D778D0D00B50D50 /* CipherSuite.h in Headers */,

+                               DC372C8F22B4509200AB9F41 /* SecCoreAnalytics.h in Headers */,
+                               D4B3B1D62115195900A43409 /* SecCmsRecipientInfo.h in Headers */,

                                DC1785871D778B8000B50D50 /* CodeSigning.h in Headers */,
                                DC17854F1D778ACD00B50D50 /* SecACL.h in Headers */,
                                DC17854E1D778ACD00B50D50 /* SecAccess.h in Headers */,
                                DC1785871D778B8000B50D50 /* CodeSigning.h in Headers */,
                                DC17854F1D778ACD00B50D50 /* SecACL.h in Headers */,
                                DC17854E1D778ACD00B50D50 /* SecAccess.h in Headers */,


@@ -22508,44 +26709,36 @@
                                DC1787751D77916000B50D50 /* SecAccessControlPriv.h in Headers */,
                                DC1787351D77903700B50D50 /* SecAccessPriv.h in Headers */,
                                DC1785181D77895A00B50D50 /* SecAsn1Coder.h in Headers */,
                                DC1787751D77916000B50D50 /* SecAccessControlPriv.h in Headers */,
                                DC1787351D77903700B50D50 /* SecAccessPriv.h in Headers */,
                                DC1785181D77895A00B50D50 /* SecAsn1Coder.h in Headers */,

+                               5AE4BEF01FA79456001B9DA4 /* SecProtocolObject.h in Headers */,

                                DC1785191D77895A00B50D50 /* SecAsn1Templates.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 */,
                                DC1785191D77895A00B50D50 /* SecAsn1Templates.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 */,
+                               5F00F95C230614AD00B832E0 /* SecImportExportPriv.h in Headers */,

                                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */,
                                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */,

+                               1BE85ED0235CEB620051E1D8 /* cms-tapi.h in Headers */,

                                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */,
                                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */,

-                               DC1787111D778FA900B50D50 /* SecCMS.h in Headers */,
+                               DC0C343A21FA7DEB00417D04 /* SecEscrowRequest.h in Headers */,

                                DC17859F1D778C8D00B50D50 /* SecCertificate.h in Headers */,
                                DC17859F1D778C8D00B50D50 /* SecCertificate.h in Headers */,

-                               DC1787361D77903700B50D50 /* SecCertificateBundle.h in Headers */,

                                DC1785501D778ACD00B50D50 /* SecCertificateOIDs.h in Headers */,
                                DC1787821D7791BE00B50D50 /* SecCertificatePriv.h in Headers */,
                                DC1785501D778ACD00B50D50 /* SecCertificateOIDs.h in Headers */,
                                DC1787821D7791BE00B50D50 /* SecCertificatePriv.h in Headers */,

+                               5A6D1B9E20810EF40057CAC8 /* SecProtocolTypes.h in Headers */,

                                DC1787831D7791C400B50D50 /* SecCertificateRequest.h in Headers */,
                                DC1787831D7791C400B50D50 /* SecCertificateRequest.h in Headers */,

-                               DC1787121D778FAA00B50D50 /* SecCmsBase.h in Headers */,
-                               DC1787131D778FAA00B50D50 /* SecCmsContentInfo.h in Headers */,
-                               DC1787141D778FAA00B50D50 /* SecCmsDecoder.h in Headers */,
-                               DC1787151D778FAA00B50D50 /* SecCmsDigestContext.h in Headers */,
-                               DC1787161D778FAA00B50D50 /* SecCmsDigestedData.h in Headers */,
-                               DC1787171D778FAA00B50D50 /* SecCmsEncoder.h in Headers */,
-                               DC1787181D778FAA00B50D50 /* SecCmsEncryptedData.h in Headers */,
-                               DC1787191D778FAA00B50D50 /* SecCmsEnvelopedData.h in Headers */,
-                               DC17871A1D778FAA00B50D50 /* SecCmsMessage.h in Headers */,
-                               DC17871B1D778FAA00B50D50 /* SecCmsRecipientInfo.h in Headers */,
+                               DCA1433C1FE0803200A40D59 /* OTControl.h in Headers */,

                                DCFE9C8F20EC1F3C00EB6BAC /* SOSControlHelper.h in Headers */,
                                DCFE9C8F20EC1F3C00EB6BAC /* SOSControlHelper.h in Headers */,

-                               DC17871C1D778FAA00B50D50 /* SecCmsSignedData.h in Headers */,
-                               DC17871D1D778FAA00B50D50 /* SecCmsSignerInfo.h in Headers */,

                                DC1785891D778B8000B50D50 /* SecCode.h in Headers */,
                                DC1785891D778B8000B50D50 /* SecCode.h in Headers */,

+                               5A04BB1A22986717001848A0 /* SecXPCHelper.h in Headers */,

                                DC1787511D7790A500B50D50 /* SecCodePriv.h in Headers */,
                                DC1787521D7790A500B50D50 /* SecCodeSigner.h in Headers */,
                                DC1785301D778A0100B50D50 /* SecCustomTransform.h in Headers */,
                                DC1787511D7790A500B50D50 /* SecCodePriv.h in Headers */,
                                DC1787521D7790A500B50D50 /* SecCodeSigner.h in Headers */,
                                DC1785301D778A0100B50D50 /* SecCustomTransform.h in Headers */,

-                               0CBFEACD200FCD33009A60E9 /* SFSignInAnalytics.h in Headers */,
+                               5A442FA8233C34FF00918373 /* SecExperimentInternal.h in Headers */,

                                DC1787771D77916A00B50D50 /* SecDH.h in Headers */,
                                DC1785311D778A0100B50D50 /* SecDecodeTransform.h in Headers */,
                                6CE365561FA101740012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                DC1785321D778A0100B50D50 /* SecDigestTransform.h in Headers */,
                                DC1787771D77916A00B50D50 /* SecDH.h in Headers */,
                                DC1785311D778A0100B50D50 /* SecDecodeTransform.h in Headers */,
                                6CE365561FA101740012F6AB /* SFAnalyticsSQLiteStore.h in Headers */,
                                DC1785321D778A0100B50D50 /* SecDigestTransform.h in Headers */,

+                               5A7E037C2227301E003DB3A0 /* SecProtocolInternal.h in Headers */,

                                DC1785331D778A0100B50D50 /* SecEncodeTransform.h in Headers */,
                                DC1785341D778A0100B50D50 /* SecEncryptTransform.h in Headers */,
                                DC1787811D7791B200B50D50 /* SecEntitlements.h in Headers */,
                                DC1785331D778A0100B50D50 /* SecEncodeTransform.h in Headers */,
                                DC1785341D778A0100B50D50 /* SecEncryptTransform.h in Headers */,
                                DC1787811D7791B200B50D50 /* SecEntitlements.h in Headers */,


@@ -22555,8 +26748,12 @@
                                DC17877E1D7791A100B50D50 /* SecIdentityPriv.h in Headers */,
                                DC1785511D778ACD00B50D50 /* SecIdentitySearch.h in Headers */,
                                DC1787381D77903700B50D50 /* SecIdentitySearchPriv.h in Headers */,
                                DC17877E1D7791A100B50D50 /* SecIdentityPriv.h in Headers */,
                                DC1785511D778ACD00B50D50 /* SecIdentitySearch.h in Headers */,
                                DC1787381D77903700B50D50 /* SecIdentitySearchPriv.h in Headers */,

+                               4791B46B2118BC0000977C3F /* OTControlProtocol.h in Headers */,
+                               5A6D1B9620810EAE0057CAC8 /* SecProtocolMetadata.h in Headers */,

                                DC17859B1D778C7400B50D50 /* SecImportExport.h in Headers */,
                                DC17859C1D778C7900B50D50 /* SecItem.h in Headers */,
                                DC17859B1D778C7400B50D50 /* SecImportExport.h in Headers */,
                                DC17859C1D778C7900B50D50 /* SecItem.h in Headers */,

+                               4780147F1FBF5D2100C4043D /* SecKeyProxy.h in Headers */,
+                               D4707A1221137719005BCFDA /* CMSDecoder.h in Headers */,

                                DC1787781D77917100B50D50 /* SecItemBackup.h in Headers */,
                                DC17877F1D7791A800B50D50 /* SecItemPriv.h in Headers */,
                                DC17859D1D778C8000B50D50 /* SecKey.h in Headers */,
                                DC1787781D77917100B50D50 /* SecItemBackup.h in Headers */,
                                DC17877F1D7791A800B50D50 /* SecItemPriv.h in Headers */,
                                DC17859D1D778C8000B50D50 /* SecKey.h in Headers */,


@@ -22564,41 +26761,47 @@
                                DC1787801D7791AD00B50D50 /* SecKeyPriv.h in Headers */,
                                DC1785521D778ACD00B50D50 /* SecKeychain.h in Headers */,
                                DC1785531D778ACD00B50D50 /* SecKeychainItem.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 */,
                                DC1785541D778ACD00B50D50 /* SecKeychainSearch.h in Headers */,
                                DC17873C1D77903700B50D50 /* SecKeychainSearchPriv.h in Headers */,
                                DC1787261D778FDE00B50D50 /* SecManifest.h in Headers */,
                                DC1787391D77903700B50D50 /* SecKeychainItemExtendedAttributes.h in Headers */,
                                DC17873A1D77903700B50D50 /* SecKeychainItemPriv.h in Headers */,
                                DC17873B1D77903700B50D50 /* SecKeychainPriv.h in Headers */,
                                DC1785541D778ACD00B50D50 /* SecKeychainSearch.h in Headers */,
                                DC17873C1D77903700B50D50 /* SecKeychainSearchPriv.h in Headers */,
                                DC1787261D778FDE00B50D50 /* SecManifest.h in Headers */,

+                               5A442FA7233C34FF00918373 /* SecExperimentPriv.h in Headers */,
+                               DCA9D84221FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */,

                                DC1786F91D778F2500B50D50 /* SecNullTransform.h in Headers */,
                                DC17873D1D77903700B50D50 /* SecPassword.h in Headers */,
                                DC1786F91D778F2500B50D50 /* SecNullTransform.h in Headers */,
                                DC17873D1D77903700B50D50 /* SecPassword.h in Headers */,

-                               5AFCF32F20746DA70010D4B5 /* SecProtocolObject.h in Headers */,
+                               6C06CB912408602A00025303 /* SecItemInternal.h in Headers */,

                                DC1787791D77917700B50D50 /* SecPasswordGenerate.h in Headers */,
                                DC1787791D77917700B50D50 /* SecPasswordGenerate.h in Headers */,

+                               1BE85ED6235CEC250051E1D8 /* sslDeprecated.h in Headers */,
+                               F6EEF77521675EF000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */,

                                DC1785941D778BF400B50D50 /* SecPolicy.h in Headers */,
                                DC1785941D778BF400B50D50 /* SecPolicy.h in Headers */,

+                               D43718C921168D7D00EA350A /* SecSMIME.h in Headers */,

                                DC17877D1D77919B00B50D50 /* SecPolicyPriv.h in Headers */,
                                B61577EA1F201542004A3930 /* SecPaddingConfigurationsPriv.h in Headers */,
                                DC17877D1D77919B00B50D50 /* SecPolicyPriv.h in Headers */,
                                B61577EA1F201542004A3930 /* SecPaddingConfigurationsPriv.h in Headers */,

+                               D47079F421128CA0005BCFDA /* SecCMS.h in Headers */,
+                               D4B3B1D3211517BC00A43409 /* SecCmsEnvelopedData.h in Headers */,

                                222F239F1DAC15C5007ACB90 /* SecTaskPriv.h in Headers */,
                                DC1785551D778ACD00B50D50 /* SecPolicySearch.h in Headers */,
                                DC1785951D778BFA00B50D50 /* SecRandom.h in Headers */,
                                222F239F1DAC15C5007ACB90 /* SecTaskPriv.h in Headers */,
                                DC1785551D778ACD00B50D50 /* SecPolicySearch.h in Headers */,
                                DC1785951D778BFA00B50D50 /* SecRandom.h in Headers */,

+                               D4B3B1CD2115150D00A43409 /* SecCmsDigestedData.h in Headers */,

                                DC17873E1D77903700B50D50 /* SecRandomP.h in Headers */,
                                DC1785351D778A0100B50D50 /* SecReadTransform.h in Headers */,
                                DC17873F1D77903700B50D50 /* SecRecoveryPassword.h in Headers */,
                                6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */,
                                DC17873E1D77903700B50D50 /* SecRandomP.h in Headers */,
                                DC1785351D778A0100B50D50 /* SecReadTransform.h in Headers */,
                                DC17873F1D77903700B50D50 /* SecRecoveryPassword.h in Headers */,
                                6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */,

-                               09A3B9D91F8267BB00C5C324 /* SecKeyProxy.h in Headers */,
+                               D4593EFF24C131180069F577 /* SecTrustStore.h in Headers */,

                                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */,
                                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */,
                                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */,
                                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */,

-                               DC17871E1D778FAA00B50D50 /* SecSMIME.h in Headers */,

                                DC17877A1D77917D00B50D50 /* SecServerEncryptionSupport.h in Headers */,
                                DC1785361D778A0100B50D50 /* SecSignVerifyTransform.h in Headers */,
                                DC17858C1D778B8000B50D50 /* SecStaticCode.h in Headers */,
                                DC1787561D7790A500B50D50 /* SecStaticCodePriv.h in Headers */,
                                DC17877A1D77917D00B50D50 /* SecServerEncryptionSupport.h in Headers */,
                                DC1785361D778A0100B50D50 /* SecSignVerifyTransform.h in Headers */,
                                DC17858C1D778B8000B50D50 /* SecStaticCode.h in Headers */,
                                DC1787561D7790A500B50D50 /* SecStaticCodePriv.h in Headers */,

-                               5A4E381C207529680047F40F /* SecProtocol.h in Headers */,

                                DC17859E1D778C8800B50D50 /* SecTask.h in Headers */,
                                DC1785371D778A0100B50D50 /* SecTransform.h in Headers */,
                                DC1786FA1D778F2500B50D50 /* SecTransformInternal.h in Headers */,
                                DC1785381D778A0100B50D50 /* SecTransformReadTransform.h in Headers */,
                                DC1786F41D778EF800B50D50 /* SecTranslocate.h in Headers */,
                                DC17859E1D778C8800B50D50 /* SecTask.h in Headers */,
                                DC1785371D778A0100B50D50 /* SecTransform.h in Headers */,
                                DC1786FA1D778F2500B50D50 /* SecTransformInternal.h in Headers */,
                                DC1785381D778A0100B50D50 /* SecTransformReadTransform.h in Headers */,
                                DC1786F41D778EF800B50D50 /* SecTranslocate.h in Headers */,

+                               D43718BC211683F100EA350A /* tsaSupport.h in Headers */,

                                DC1785A01D778C9400B50D50 /* SecTrust.h in Headers */,
                                DC1787841D7791C900B50D50 /* SecTrustPriv.h in Headers */,
                                6CDB5FFC1FA78D2D00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                DC1785A01D778C9400B50D50 /* SecTrust.h in Headers */,
                                DC1787841D7791C900B50D50 /* SecTrustPriv.h in Headers */,
                                6CDB5FFC1FA78D2D00410924 /* SFAnalyticsMultiSampler.h in Headers */,


@@ -22617,55 +26820,65 @@
                                DC926F081F33F7D30012A315 /* SecCodeHost.h in Headers */,
                                DC17876A1D77911D00B50D50 /* asn1Templates.h in Headers */,
                                DC17876B1D77911D00B50D50 /* certExtensionTemplates.h in Headers */,
                                DC926F081F33F7D30012A315 /* SecCodeHost.h in Headers */,
                                DC17876A1D77911D00B50D50 /* asn1Templates.h in Headers */,
                                DC17876B1D77911D00B50D50 /* certExtensionTemplates.h in Headers */,

+                               D4707A2D2114C1E8005BCFDA /* SecCmsContentInfo.h in Headers */,

                                DC1785971D778C0800B50D50 /* certextensions.h in Headers */,
                                DC1785971D778C0800B50D50 /* certextensions.h in Headers */,

+                               4791B46D2118BD0B00977C3F /* SecXPCError.h in Headers */,

                                DC17875C1D7790CE00B50D50 /* checkpw.h in Headers */,
                                DC17875C1D7790CE00B50D50 /* checkpw.h in Headers */,

-                               AA44E0DF2032519F001EA371 /* SecProtocolPriv.h in Headers */,

                                DC17876C1D77911D00B50D50 /* csrTemplates.h in Headers */,
                                DC17856C1D778B4A00B50D50 /* cssm.h in Headers */,
                                DC17856D1D778B4A00B50D50 /* cssmaci.h in Headers */,
                                DC17876C1D77911D00B50D50 /* csrTemplates.h in Headers */,
                                DC17856C1D778B4A00B50D50 /* cssm.h in Headers */,
                                DC17856D1D778B4A00B50D50 /* cssmaci.h in Headers */,

+                               D4707A272113EBC1005BCFDA /* SecCmsDecoder.h in Headers */,
+                               D4707A212113AC34005BCFDA /* SecCmsBase.h in Headers */,

                                6CBF65401FA1480C00A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                DC17856E1D778B4A00B50D50 /* cssmapi.h in Headers */,
                                DC1785991D778C5300B50D50 /* cssmapple.h in Headers */,
                                DC1787431D77906C00B50D50 /* cssmapplePriv.h in Headers */,
                                6CBF65401FA1480C00A68667 /* SFAnalyticsActivityTracker.h in Headers */,
                                DC17856E1D778B4A00B50D50 /* cssmapi.h in Headers */,
                                DC1785991D778C5300B50D50 /* cssmapple.h in Headers */,
                                DC1787431D77906C00B50D50 /* cssmapplePriv.h in Headers */,

-                               5AFCF32C20746BC90010D4B5 /* SecProtocolMetadata.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 */,
                                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 */,

-                               5AC6BFAC2077CD310051737D /* SecProtocolTypes.h in Headers */,

                                47A91562201A43BA00FF8F46 /* SecSharedCredential.h in Headers */,
                                47A91562201A43BA00FF8F46 /* SecSharedCredential.h in Headers */,

+                               5AF594031FA1051600A5C1EC /* SecProtocolPriv.h in Headers */,

                                DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */,
                                DC337B1F1EA04E2100B3A1F0 /* SecBase64.h in Headers */,

+                               D4707A242113E74B005BCFDA /* SecCmsEncoder.h in Headers */,

                                DC1785731D778B4A00B50D50 /* cssmerr.h in Headers */,
                                DC1785741D778B4A00B50D50 /* cssmkrapi.h in Headers */,
                                DC1785751D778B4A00B50D50 /* cssmkrspi.h in Headers */,
                                DC1785761D778B4A00B50D50 /* cssmspi.h in Headers */,
                                DC1785771D778B4A00B50D50 /* cssmtpi.h in Headers */,
                                DC1785781D778B4A00B50D50 /* cssmtype.h in Headers */,
                                DC1785731D778B4A00B50D50 /* cssmerr.h in Headers */,
                                DC1785741D778B4A00B50D50 /* cssmkrapi.h in Headers */,
                                DC1785751D778B4A00B50D50 /* cssmkrspi.h in Headers */,
                                DC1785761D778B4A00B50D50 /* cssmspi.h in Headers */,
                                DC1785771D778B4A00B50D50 /* cssmtpi.h in Headers */,
                                DC1785781D778B4A00B50D50 /* cssmtype.h in Headers */,

-                               5AFCF32A20746BC30010D4B5 /* SecProtocolOptions.h in Headers */,
+                               5A6D1B9C20810EDE0057CAC8 /* SecProtocolOptions.h in Headers */,

                                DC17877B1D77918C00B50D50 /* der_plist.h in Headers */,
                                DC1785791D778B4A00B50D50 /* eisl.h in Headers */,
                                DC17857A1D778B4A00B50D50 /* emmspi.h in Headers */,
                                DC17877B1D77918C00B50D50 /* der_plist.h in Headers */,
                                DC1785791D778B4A00B50D50 /* eisl.h in Headers */,
                                DC17857A1D778B4A00B50D50 /* emmspi.h in Headers */,

+                               D4707A2A2113EF68005BCFDA /* SecCmsMessage.h in Headers */,
+                               1BE85ED3235CEBB40051E1D8 /* secport-tapi.h in Headers */,

                                6C8CE6C21FA248DB0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                6C8CE6C21FA248DB0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,

+                               D4B3B1DC21152AD300A43409 /* SecCmsSignerInfo.h in Headers */,

                                DC17857B1D778B4A00B50D50 /* emmtype.h in Headers */,
                                DC17876D1D77911D00B50D50 /* keyTemplates.h in Headers */,
                                DC17853D1D778A3100B50D50 /* mds.h in Headers */,
                                DC17853C1D778A3100B50D50 /* mds_schema.h in Headers */,
                                DC17857B1D778B4A00B50D50 /* emmtype.h in Headers */,
                                DC17876D1D77911D00B50D50 /* keyTemplates.h in Headers */,
                                DC17853D1D778A3100B50D50 /* mds.h in Headers */,
                                DC17853C1D778A3100B50D50 /* mds_schema.h in Headers */,

+                               D4707A0F211373DE005BCFDA /* CMSPrivate.h in Headers */,

                                DC1787231D778FC900B50D50 /* mdspriv.h in Headers */,
                                DC2671001F3E766E00816EED /* SecOTRSession.h in Headers */,
                                DC17876E1D77911D00B50D50 /* nameTemplates.h in Headers */,
                                DC1787231D778FC900B50D50 /* mdspriv.h in Headers */,
                                DC2671001F3E766E00816EED /* SecOTRSession.h in Headers */,
                                DC17876E1D77911D00B50D50 /* nameTemplates.h in Headers */,

+                               0C0582CC20D9CA4900D7BD7A /* OTClique.h in Headers */,

                                DC17876F1D77911D00B50D50 /* ocspTemplates.h in Headers */,
                                DC1785161D77895A00B50D50 /* oidsalg.h in Headers */,
                                DC1785171D77895A00B50D50 /* oidsattr.h in Headers */,
                                DCCBFA391DBAE445001DD54D /* SecInternal.h in Headers */,
                                DC17857C1D778B4A00B50D50 /* oidsbase.h in Headers */,
                                DC17857D1D778B4A00B50D50 /* oidscert.h in Headers */,
                                DC17876F1D77911D00B50D50 /* ocspTemplates.h in Headers */,
                                DC1785161D77895A00B50D50 /* oidsalg.h in Headers */,
                                DC1785171D77895A00B50D50 /* oidsattr.h in Headers */,
                                DCCBFA391DBAE445001DD54D /* SecInternal.h in Headers */,
                                DC17857C1D778B4A00B50D50 /* oidsbase.h in Headers */,
                                DC17857D1D778B4A00B50D50 /* oidscert.h in Headers */,

+                               D4B3B1D921151BBF00A43409 /* SecCmsSignedData.h in Headers */,

                                DC17857E1D778B4A00B50D50 /* oidscrl.h in Headers */,
                                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */,
                                DC17857E1D778B4A00B50D50 /* oidscrl.h in Headers */,
                                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */,

+                               D4707A302114C316005BCFDA /* SecCmsDigestContext.h in Headers */,

                                DC2C5F511F0D935300FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                DC2C5F511F0D935300FEBDA7 /* CKKSControlProtocol.h in Headers */,

+                               AA7C71B72185429900EB314F /* SecProtocolTypesPriv.h in Headers */,

                                DC1787711D77911D00B50D50 /* secasn1t.h in Headers */,
                                DC1786FC1D778F3D00B50D50 /* sslTypes.h in Headers */,
                                DC1787711D77911D00B50D50 /* secasn1t.h in Headers */,
                                DC1786FC1D778F3D00B50D50 /* sslTypes.h in Headers */,

-                               DC17871F1D778FAA00B50D50 /* tsaSupport.h in Headers */,

                                DC17857F1D778B4A00B50D50 /* x509defs.h in Headers */,
                                DCB3323B1F4681AE00178C30 /* SecOTR.h in Headers */,
                                4723C9CB1F152ECF0082882F /* SFSQLiteStatement.h in Headers */,
                                DC17857F1D778B4A00B50D50 /* x509defs.h in Headers */,
                                DCB3323B1F4681AE00178C30 /* SecOTR.h in Headers */,
                                4723C9CB1F152ECF0082882F /* SFSQLiteStatement.h in Headers */,


@@ -22675,79 +26888,28 @@
                                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */,
                                DCB3323C1F46833E00178C30 /* SecLogging.h in Headers */,
                                DC9C95BD1F79DC5A000D19E5 /* CKKSControl.h in Headers */,
                                4723C9C31F152EB60082882F /* SFObjCType.h in Headers */,
                                DCB3323C1F46833E00178C30 /* SecLogging.h in Headers */,
                                DC9C95BD1F79DC5A000D19E5 /* CKKSControl.h in Headers */,

+                               0CD743BC23C3EF1E00FA0EC5 /* OTClique+Private.h in Headers */,

                                DC3C73561D837B9B00F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                EB6928C61D9C9C6F00062A18 /* SecRecoveryKey.h in Headers */,
                                DC3C73561D837B9B00F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                EB6928C61D9C9C6F00062A18 /* SecRecoveryKey.h in Headers */,

+                               D4B3B1D0211516A100A43409 /* SecCmsEncryptedData.h in Headers */,

                                4723C9C71F152EC10082882F /* SFSQLite.h in Headers */,
                                47A05B171FDB5D9F00D0816E /* SFKeychainControl.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                4723C9C71F152EC10082882F /* SFSQLite.h in Headers */,
                                47A05B171FDB5D9F00D0816E /* SFKeychainControl.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC222C641E034D1F00B09171 /* Headers */ = {
+               DC311E6F2124B8A8002F5EAE /* Headers */ = {

                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 /* CKKSAnalytics.h in Headers */,
-                               DC222C671E034D1F00B09171 /* SecDbKeychainItem.h in Headers */,
-                               DC222C681E034D1F00B09171 /* SecDbQuery.h in Headers */,
-                               DCEA5D561E2826DB0089CF55 /* CKKSSIV.h in Headers */,
-                               DC222C691E034D1F00B09171 /* CKKSMirrorEntry.h in Headers */,
-                               470D96721FCDE55B0065FE90 /* SecCDKeychain.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 */,
-                               DCF7A8A11F04502400CABE89 /* CKKSControlProtocol.h in Headers */,
-                               47FF17271FD60ACA00875565 /* SFKeychainServer.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 */,
+                               DC311E7A2124B8EF002F5EAE /* aks_real_witness.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DC36895A21235F42003A3735 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DC36896321235FA2003A3735 /* mockaks.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -22755,47 +26917,82 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DC0FA6B02291F63F00FE01C4 /* OctagonPendingFlag.h in Headers */,

                                47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */,
                                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */,
                                47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */,
                                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */,

+                               DCB55175247F48290009A859 /* CKKSDeleteCKZoneOperation.h in Headers */,
+                               DC1E5AB623063A4E00918162 /* CKKSPeerProvider.h in Headers */,
+                               DC047081218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.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 */,
                                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 */,
+                               DCD33D93220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.h in Headers */,
+                               DCC54181225C05180095D926 /* OTUploadNewCKKSTLKsOperation.h in Headers */,

                                DC14478A1F5764C600236DB4 /* CKKSResultOperation.h in Headers */,
                                DCFE1C511F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */,
                                DC14478A1F5764C600236DB4 /* CKKSResultOperation.h in Headers */,
                                DCFE1C511F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.h in Headers */,
                                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */,

+                               DC5A01E821BB428500D87AB9 /* CKKSTLKShare.h in Headers */,
+                               DC45D43D22EB619D00CEB6B7 /* OctagonStateMachineObservers.h in Headers */,
+                               0C38AA98212B2D2300C90A1D /* OTJoinWithVoucherOperation.h in Headers */,
+                               DCFC91AF21F16E0B00E674DD /* OctagonStateMachine.h in Headers */,

                                DC762A9E1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */,
                                DC762A9E1E57A86A00B03A2C /* CKKSRecordHolder.h in Headers */,

+                               DC5681AA224DA05F008F8DEB /* OctagonFlags.h in Headers */,
+                               DCC67E0E20DD7E0A00A70A31 /* OTStates.h in Headers */,

                                DC5BB4FE1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */,
                                DC5BB4FE1E0C98320010F836 /* CKKSOutgoingQueueOperation.h in Headers */,

+                               DC93F02922387A010072720A /* OTSOSUpdatePreapprovalsOperation.h in Headers */,

                                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */,
                                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */,

-                               0C8BBF1C1FCB4F0300580909 /* OTControl.h in Headers */,

                                DC52E7E81D80BE8700B0A59C /* SOSChangeTracker.h in Headers */,
                                DC52E7E81D80BE8700B0A59C /* SOSChangeTracker.h in Headers */,

+                               DCAB17D12200D26900E1DFCF /* SecEscrowPendingRecord.h in Headers */,

                                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */,
                                DC52E7E51D80BE7400B0A59C /* SOSEngine.h in Headers */,
                                DC52E7E41D80BE6E00B0A59C /* SecDbKeychainItem.h in Headers */,
                                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */,
                                DC52E7E51D80BE7400B0A59C /* SOSEngine.h in Headers */,
                                DC52E7E41D80BE6E00B0A59C /* SecDbKeychainItem.h in Headers */,

+                               DC221BAB2267E2A60068DBCF /* OTUpdateTPHOperation.h in Headers */,

                                DC7A17ED1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */,
                                DC52E7E31D80BDA600B0A59C /* SecDbQuery.h in Headers */,
                                470D96711FCDE55B0065FE90 /* SecCDKeychain.h in Headers */,
                                DC7A17ED1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h in Headers */,
                                DC52E7E31D80BDA600B0A59C /* SecDbQuery.h in Headers */,
                                470D96711FCDE55B0065FE90 /* SecCDKeychain.h in Headers */,

+                               DCC40B112383786D00402CB9 /* CKKSStates.h in Headers */,

                                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */,
                                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */,
                                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */,
                                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */,

+                               DCC67E2D20DDC07900A70A31 /* OTPrepareOperation.h in Headers */,
+                               DCAB17D52200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.h in Headers */,
+                               DC3AF52C2229E6C0006577E8 /* CKKSListenerCollection.h in Headers */,
+                               DCBFF832222611A200C5C044 /* OTFetchCKKSKeysOperation.h in Headers */,
+                               0C38AA92212B2D1900C90A1D /* OTEpochOperation.h in Headers */,
+                               DC7250372296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h in Headers */,
+                               DCA9BC02221B721E00B4EB26 /* CKKSCloudKitClassDependencies.h in Headers */,
+                               DCF94A7B222D9F2400C01744 /* OctagonCKKSPeerAdapter.h in Headers */,

                                DCFE1C271F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */,
                                DCFE1C271F17E455007640C8 /* CKKSDeviceStateEntry.h in Headers */,

-                               BEE4B1921FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.h in Headers */,
-                               DCFB12C51E95A4C000510F5F /* CKKSCKAccountStateTracker.h in Headers */,
+                               DCFB12C51E95A4C000510F5F /* CKKSAccountStateTracker.h in Headers */,

                                DC378B381DEFADB500A3DAFA /* CKKSZoneStateEntry.h in Headers */,
                                DC378B381DEFADB500A3DAFA /* CKKSZoneStateEntry.h in Headers */,

-                               DC7341F31F8447AB00AB9BDF /* CKKSTLKShare.h in Headers */,
+                               DC7341F31F8447AB00AB9BDF /* CKKSTLKShareRecord.h in Headers */,
+                               DC8757F4218D2003000E65F1 /* OTRemovePeersOperation.h in Headers */,

                                DC52E7E71D80BE8100B0A59C /* SecItemDataSource.h in Headers */,
                                DC18F76F1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,
                                DC52E7E71D80BE8100B0A59C /* SecItemDataSource.h in Headers */,
                                DC18F76F1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h in Headers */,

+                               DC9C06692149DFE400C6F7B8 /* OTAuthKitAdapter.h in Headers */,

                                47922D461FAA7C340008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */,
                                DC9082C61EA027DB00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */,
                                47922D461FAA7C340008F7E0 /* SecDbKeychainSerializedMetadata.h in Headers */,
                                DC9082C61EA027DB00D0C1C5 /* CKKSZoneChangeFetcher.h in Headers */,

+                               DC614C5122A9BDB500E16ADA /* CKKSZoneModifier.h in Headers */,

                                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,
                                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */,

-                               BEE4B1981FFDAFE600777D39 /* SFPublicKey+SPKI.h in Headers */,
+                               DC0D16012363A1D6007F0951 /* OTSetCDPBitOperation.h in Headers */,
+                               0C38AA96212B2D1E00C90A1D /* OTClientVoucherOperation.h in Headers */,

                                DC378B3C1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h in Headers */,
                                DC378B3C1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.h in Headers */,

+                               DC5F65AE2225C22C0051E9FA /* CKKSProvideKeySetOperation.h in Headers */,
+                               DCB946AF22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.h in Headers */,
+                               DCFF82742162876400D54B02 /* OTResetOperation.h in Headers */,

                                DC52E7E61D80BE7B00B0A59C /* SecItemDb.h in Headers */,
                                DC52E7E61D80BE7B00B0A59C /* SecItemDb.h in Headers */,

+                               DCF12673218A757A000124C6 /* OTLeaveCliqueOperation.h in Headers */,

                                DCAD9B441F8D939C00C5E2AE /* CKKSFixups.h in Headers */,
                                DCAD9B441F8D939C00C5E2AE /* CKKSFixups.h in Headers */,

+                               DC0D16062363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h in Headers */,

                                DC9C95B41F79CFD1000D19E5 /* CKKSControl.h in Headers */,
                                DC52E7EA1D80BE9500B0A59C /* SecItemSchema.h in Headers */,
                                DC9C95B41F79CFD1000D19E5 /* CKKSControl.h in Headers */,
                                DC52E7EA1D80BE9500B0A59C /* SecItemSchema.h in Headers */,

+                               DC7F79BA22EA5C73001FB69A /* OTLocalCKKSResetOperation.h in Headers */,
+                               DC047087218BCEF20078BDAA /* OTOperationDependencies.h in Headers */,
+                               DC19484C21812EC5007C2260 /* OTDeviceInformationAdapter.h in Headers */,
+                               DCA9D84D21FFF04700B27421 /* EscrowRequestServer.h in Headers */,

                                DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */,
                                DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */,

+                               DC6DE899213076C000C6B56D /* OTSOSUpgradeOperation.h in Headers */,

                                DC52E7E91D80BE8D00B0A59C /* SecKeybagSupport.h in Headers */,
                                DCD662F51E329B6800188186 /* CKKSNewTLKOperation.h in Headers */,
                                DC52E7EB1D80BE9B00B0A59C /* iCloudTrace.h in Headers */,
                                DC52E7E91D80BE8D00B0A59C /* SecKeybagSupport.h in Headers */,
                                DCD662F51E329B6800188186 /* CKKSNewTLKOperation.h in Headers */,
                                DC52E7EB1D80BE9B00B0A59C /* iCloudTrace.h in Headers */,


@@ -22803,16 +27000,21 @@
                                47FF17261FD60ACA00875565 /* SFKeychainServer.h in Headers */,
                                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */,
                                DC15F7661E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */,
                                47FF17261FD60ACA00875565 /* SFKeychainServer.h in Headers */,
                                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */,
                                DC15F7661E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.h in Headers */,

+                               DCD33D8E220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.h in Headers */,

                                DCD6C4B21EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */,
                                DCD6C4B21EC5302500414FEE /* CKKSNearFutureScheduler.h in Headers */,

-                               0C8BBF241FCB4FE700580909 /* OTManager.h in Headers */,
+                               1B5EAADC2252ABCD008D27E7 /* OTFetchViewsOperation.h in Headers */,

                                DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,
                                DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,

-                               0C8BBF1D1FCB4F0300580909 /* OTControlProtocol.h in Headers */,
-                               DCEA5D851E2F14810089CF55 /* CKKSAPSReceiver.h in Headers */,
+                               DCEA5D851E2F14810089CF55 /* OctagonAPSReceiver.h in Headers */,
+                               6C6AF182221A07230091CE0A /* SecDbKeychainSerializedMetadataKey.h in Headers */,

                                DC1447961F5766D200236DB4 /* NSOperationCategories.h in Headers */,
                                DC4DB1501E24692100CD6769 /* CKKSKey.h in Headers */,
                                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */,
                                DC1447961F5766D200236DB4 /* NSOperationCategories.h in Headers */,
                                DC4DB1501E24692100CD6769 /* CKKSKey.h in Headers */,
                                DCE278DD1ED789EF0083B485 /* CKKSCurrentItemPointer.h in Headers */,

+                               DCF46C2E214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h in Headers */,
+                               DCE772662290712F005862B4 /* OctagonCheckTrustStateOperation.h in Headers */,

                                DA6AA1671FE88AFB004565B0 /* CKKSControlServer.h in Headers */,
                                DA6AA1671FE88AFB004565B0 /* CKKSControlServer.h in Headers */,

+                               DCD33D80220B9DC8000A390B /* OctagonStateMachineHelpers.h in Headers */,
+                               DC5060EB20E2D88300925005 /* OTCuttlefishContext.h in Headers */,

                                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */,
                                473337791FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */,
                                47922D4A1FAA7C430008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */,
                                DCEA5D551E2826DB0089CF55 /* CKKSSIV.h in Headers */,
                                473337791FDAFBCC00E19F30 /* SFKeychainControlManager.h in Headers */,
                                47922D4A1FAA7C430008F7E0 /* SecDbKeychainSerializedSecretData.h in Headers */,


@@ -22834,46 +27036,36 @@
                                DC3C73581D837BDC00F6A832 /* SOSCloudCircleInternal.h in Headers */,
                                DCD8A1DC1E09F5E500E4FA0A /* SOSAccount.h in Headers */,
                                DCD8A1E21E09F78A00E4FA0A /* SOSTransportCircle.h in Headers */,
                                DC3C73581D837BDC00F6A832 /* SOSCloudCircleInternal.h in Headers */,
                                DCD8A1DC1E09F5E500E4FA0A /* SOSAccount.h in Headers */,
                                DCD8A1E21E09F78A00E4FA0A /* SOSTransportCircle.h in Headers */,

+                               DC59245120E46F840073D284 /* SOSRecoveryKeyBag.h in Headers */,

                                DC52E91D1D80C44400B0A59C /* SOSCoder.h in Headers */,
                                DC52E91D1D80C44400B0A59C /* SOSCoder.h in Headers */,

+                               DC2FA72B20E57C1000DB7518 /* SOSAccountTrust.h in Headers */,

                                DC52E92B1D80C4A800B0A59C /* SOSConcordanceTrust.h in Headers */,
                                DC52E9331D80C4E500B0A59C /* SOSDataSource.h in Headers */,
                                DC52E9061D80C3AD00B0A59C /* SOSDigestVector.h in Headers */,
                                DC52E9281D80C49300B0A59C /* SOSManifest.h in Headers */,
                                DC52E90B1D80C3D400B0A59C /* SOSMessage.h in Headers */,
                                DC52E9381D80C50800B0A59C /* SOSPeer.h in Headers */,
                                DC52E92B1D80C4A800B0A59C /* SOSConcordanceTrust.h in Headers */,
                                DC52E9331D80C4E500B0A59C /* SOSDataSource.h in Headers */,
                                DC52E9061D80C3AD00B0A59C /* SOSDigestVector.h in Headers */,
                                DC52E9281D80C49300B0A59C /* SOSManifest.h in Headers */,
                                DC52E90B1D80C3D400B0A59C /* SOSMessage.h in Headers */,
                                DC52E9381D80C50800B0A59C /* SOSPeer.h in Headers */,

+                               DC59244B20E46EA20073D284 /* SOSRingTypes.h in Headers */,

                                DC52E91C1D80C43F00B0A59C /* SOSPeerCoder.h in Headers */,
                                DC52E91C1D80C43F00B0A59C /* SOSPeerCoder.h in Headers */,

+                               480C03DC2145A84F0034570E /* SOSTrustedDeviceAttributes.h in Headers */,

                                DC52E9161D80C41A00B0A59C /* SOSPeerInfoInternal.h in Headers */,
                                DC3C735A1D837C0000F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                DC52E91A1D80C43500B0A59C /* SOSRing.h in Headers */,
                                DC52E9161D80C41A00B0A59C /* SOSPeerInfoInternal.h in Headers */,
                                DC3C735A1D837C0000F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                DC52E91A1D80C43500B0A59C /* SOSRing.h in Headers */,

-                               48E617221DBEC6C60098EAAD /* SOSBackupInformation.h in Headers */,

                                CD198F971DE27B9E00F6FB83 /* SOSAccountPriv.h in Headers */,
                                DC52E9231D80C47100B0A59C /* SOSTransportCircleKVS.h in Headers */,
                                DC52E92C1D80C4AF00B0A59C /* SOSTransportKeyParameter.h in Headers */,
                                CD198F971DE27B9E00F6FB83 /* SOSAccountPriv.h in Headers */,
                                DC52E9231D80C47100B0A59C /* SOSTransportCircleKVS.h in Headers */,
                                DC52E92C1D80C4AF00B0A59C /* SOSTransportKeyParameter.h in Headers */,

+                               DC59245320E46FB10073D284 /* SOSRingBackup.h in Headers */,
+                               DC59245720E470390073D284 /* SOSRingConcordanceTrust.h in Headers */,

                                DC52E9241D80C47900B0A59C /* SOSTransportMessage.h in Headers */,
                                DC52E9241D80C47900B0A59C /* SOSTransportMessage.h in Headers */,

+                               DC59244E20E46F200073D284 /* SOSTransport.h in Headers */,

                                DC52E9321D80C4DF00B0A59C /* SOSTransportMessageKVS.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                DC52E9321D80C4DF00B0A59C /* SOSTransportMessageKVS.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC52EA481D80CB7000B0A59C /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               F9C8AFCD223740C800E7D6AE /* requirement.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC52EBD11D80CEF100B0A59C /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                DC52EC301D80CFB200B0A59C /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                DC52EC301D80CFB200B0A59C /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCB332381F46804600178C30 /* SOSSysdiagnose.h in Headers */,

                                DCE5DC101EA802DA006308A6 /* secToolFileIO.h in Headers */,
                                DCE5DC111EA80348006308A6 /* accountCirclesViewsPrint.h in Headers */,
                        );
                                DCE5DC101EA802DA006308A6 /* secToolFileIO.h in Headers */,
                                DCE5DC111EA80348006308A6 /* accountCirclesViewsPrint.h in Headers */,
                        );


@@ -22929,7 +27121,6 @@
                        files = (
                                DC0B62281D90974300D43BCB /* si-25-cms-skid.h in Headers */,
                                DCE2341720A3D4B8009766A3 /* si-cms-hash-agility-data.h in Headers */,
                        files = (
                                DC0B62281D90974300D43BCB /* si-25-cms-skid.h in Headers */,
                                DCE2341720A3D4B8009766A3 /* si-cms-hash-agility-data.h in Headers */,

-                               D487FBBA1DB835B500D4BB0B /* si-29-sectrust-sha1-deprecation.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -22947,6 +27138,7 @@
                        files = (
                                DC5ABDF01D832E8300CF422C /* srCdsaUtils.h in Headers */,
                                DC5ABDF11D832E8300CF422C /* createFVMaster.h in Headers */,
                        files = (
                                DC5ABDF01D832E8300CF422C /* srCdsaUtils.h in Headers */,
                                DC5ABDF11D832E8300CF422C /* createFVMaster.h in Headers */,

+                               F9F77E99223C2F9A00E5CBF6 /* requirement.h in Headers */,

                                DC5ABDF21D832E8300CF422C /* mds_install.h in Headers */,
                                DC5ABDF31D832E8300CF422C /* cmsutil.h in Headers */,
                                DC5ABDF41D832E8300CF422C /* db_commands.h in Headers */,
                                DC5ABDF21D832E8300CF422C /* mds_install.h in Headers */,
                                DC5ABDF31D832E8300CF422C /* cmsutil.h in Headers */,
                                DC5ABDF41D832E8300CF422C /* db_commands.h in Headers */,


@@ -22994,10 +27186,12 @@
                                DC5AC1091D83555A00CF422C /* server.h in Headers */,
                                DC5AC10A1D83555A00CF422C /* session.h in Headers */,
                                DC5AC10B1D83555A00CF422C /* structure.h in Headers */,
                                DC5AC1091D83555A00CF422C /* server.h in Headers */,
                                DC5AC10A1D83555A00CF422C /* session.h in Headers */,
                                DC5AC10B1D83555A00CF422C /* structure.h in Headers */,

+                               DC0BD4F121BB05F2006B9154 /* CKKSKeychainBackedKey.h in Headers */,

                                DC5AC10C1D83555A00CF422C /* dbcrypto.h in Headers */,
                                DC5AC10D1D83555A00CF422C /* localdatabase.h in Headers */,
                                DC5AC10E1D83555A00CF422C /* localkey.h in Headers */,
                                DC5AC10F1D83555A00CF422C /* kcdatabase.h in Headers */,
                                DC5AC10C1D83555A00CF422C /* dbcrypto.h in Headers */,
                                DC5AC10D1D83555A00CF422C /* localdatabase.h in Headers */,
                                DC5AC10E1D83555A00CF422C /* localkey.h in Headers */,
                                DC5AC10F1D83555A00CF422C /* kcdatabase.h in Headers */,

+                               1BC6F79C21C9955F005ED67A /* util.h in Headers */,

                                DC5AC1101D83555A00CF422C /* kckey.h in Headers */,
                                DC5AC1111D83555A00CF422C /* tempdatabase.h in Headers */,
                                DC5AC1121D83555A00CF422C /* tokendatabase.h in Headers */,
                                DC5AC1101D83555A00CF422C /* kckey.h in Headers */,
                                DC5AC1111D83555A00CF422C /* tempdatabase.h in Headers */,
                                DC5AC1121D83555A00CF422C /* tokendatabase.h in Headers */,


@@ -23016,7 +27210,6 @@
                                DC5AC11F1D83555A00CF422C /* credential.h in Headers */,
                                DC5AC1201D83555A00CF422C /* clientid.h in Headers */,
                                DC5AC1211D83555A00CF422C /* codesigdb.h in Headers */,
                                DC5AC11F1D83555A00CF422C /* credential.h in Headers */,
                                DC5AC1201D83555A00CF422C /* clientid.h in Headers */,
                                DC5AC1211D83555A00CF422C /* codesigdb.h in Headers */,

-                               DC5AC1221D83555A00CF422C /* csproxy.h in Headers */,

                                DC5AC1231D83555A00CF422C /* agentclient.h in Headers */,
                                DC5AC1241D83555A00CF422C /* agentquery.h in Headers */,
                                DC5AC1251D83555A00CF422C /* auditevents.h in Headers */,
                                DC5AC1231D83555A00CF422C /* agentclient.h in Headers */,
                                DC5AC1241D83555A00CF422C /* agentquery.h in Headers */,
                                DC5AC1251D83555A00CF422C /* auditevents.h in Headers */,


@@ -23049,52 +27242,10 @@
                                DC6A82A31D87762900418608 /* ucsp_types.h in Headers */,
                                DC6A82A21D87762400418608 /* ucsp.h in Headers */,
                                DC6A82A11D87761F00418608 /* ucspNotify.h in Headers */,
                                DC6A82A31D87762900418608 /* ucsp_types.h in Headers */,
                                DC6A82A21D87762400418608 /* ucsp.h in Headers */,
                                DC6A82A11D87761F00418608 /* ucspNotify.h in Headers */,

-                               DC6A82A01D87761700418608 /* cshosting.h in Headers */,

                                DC9036B31D9DFED600B6C234 /* ss_types.defs in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                DC9036B31D9DFED600B6C234 /* ss_types.defs in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC71D9A01D95BA6C0065FB93 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC71D9A11D95BA6C0065FB93 /* SecAsn1Coder.h in Headers */,
-                               DC71D9A21D95BA6C0065FB93 /* SecAsn1Templates.h in Headers */,
-                               DC71D9A31D95BA6C0065FB93 /* SecAsn1Types.h in Headers */,
-                               DC71D9A41D95BA6C0065FB93 /* SecNssCoder.h in Headers */,
-                               DC71D9A51D95BA6C0065FB93 /* X509Templates.h in Headers */,
-                               DC71D9A61D95BA6C0065FB93 /* oidsbase.h in Headers */,
-                               DC71D9A71D95BA6C0065FB93 /* certExtensionTemplates.h in Headers */,
-                               DC71D9A81D95BA6C0065FB93 /* csrTemplates.h in Headers */,
-                               DC71D9A91D95BA6C0065FB93 /* keyTemplates.h in Headers */,
-                               DC71D9AA1D95BA6C0065FB93 /* nameTemplates.h in Headers */,
-                               DC71D9AB1D95BA6C0065FB93 /* nssUtils.h in Headers */,
-                               DC71D9AC1D95BA6C0065FB93 /* ocspTemplates.h in Headers */,
-                               DC71D9AD1D95BA6C0065FB93 /* oidsalg.h in Headers */,
-                               DC71D9AE1D95BA6C0065FB93 /* oidsattr.h in Headers */,
-                               DC71D9AF1D95BA6C0065FB93 /* oidsocsp.h in Headers */,
-                               DC71D9B01D95BA6C0065FB93 /* osKeyTemplates.h in Headers */,
-                               DC71D9B11D95BA6C0065FB93 /* pkcs12Templates.h in Headers */,
-                               DC71D9B21D95BA6C0065FB93 /* pkcs7Templates.h in Headers */,
-                               DC71D9B31D95BA6C0065FB93 /* plarena.h in Headers */,
-                               DC71D9B41D95BA6C0065FB93 /* plarenas.h in Headers */,
-                               DC71D9B51D95BA6C0065FB93 /* plstr.h in Headers */,
-                               DC71D9B61D95BA6C0065FB93 /* prbit.h in Headers */,
-                               DC71D9B71D95BA6C0065FB93 /* prcpucfg.h in Headers */,
-                               DC71D9B81D95BA6C0065FB93 /* prerr.h in Headers */,
-                               DC71D9B91D95BA6C0065FB93 /* prerror.h in Headers */,
-                               DC71D9BA1D95BA6C0065FB93 /* prlog.h in Headers */,
-                               DC71D9BB1D95BA6C0065FB93 /* prmem.h in Headers */,
-                               DC71D9BC1D95BA6C0065FB93 /* protypes.h in Headers */,
-                               DC71D9BD1D95BA6C0065FB93 /* prtypes.h in Headers */,
-                               DC71D9BE1D95BA6C0065FB93 /* secasn1.h in Headers */,
-                               DC71D9BF1D95BA6C0065FB93 /* secasn1t.h in Headers */,
-                               DC71D9C01D95BA6C0065FB93 /* seccomon.h in Headers */,
-                               DC71D9C11D95BA6C0065FB93 /* secerr.h in Headers */,
-                               DC71D9C21D95BA6C0065FB93 /* secport.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                DC8834021D8A218F00CE0ACA /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                DC8834021D8A218F00CE0ACA /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -23106,6 +27257,7 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               F6EEF76F21675E8000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */,

                                DC0BC57D1D8B701B00070CB0 /* Authorization.h in Headers */,
                                DC0BC57F1D8B703100070CB0 /* AuthorizationPlugin.h in Headers */,
                                DC0BC5801D8B703C00070CB0 /* AuthorizationPriv.h in Headers */,
                                DC0BC57D1D8B701B00070CB0 /* Authorization.h in Headers */,
                                DC0BC57F1D8B703100070CB0 /* AuthorizationPlugin.h in Headers */,
                                DC0BC5801D8B703C00070CB0 /* AuthorizationPriv.h in Headers */,


@@ -23175,7 +27327,6 @@
                                DCB342091D8A2BAD0054D16E /* cssmdata.h in Headers */,
                                DCB342071D8A2BAD0054D16E /* cssmcred.h in Headers */,
                                DCB3422F1D8A2BAD0054D16E /* walkers.h in Headers */,
                                DCB342091D8A2BAD0054D16E /* cssmdata.h in Headers */,
                                DCB342071D8A2BAD0054D16E /* cssmcred.h in Headers */,
                                DCB3422F1D8A2BAD0054D16E /* walkers.h in Headers */,

-                               DCB3422D1D8A2BAD0054D16E /* uniformrandom.h in Headers */,

                                DCB342051D8A2BAD0054D16E /* cssmcert.h in Headers */,
                                DCB3421B1D8A2BAD0054D16E /* cssmtrust.h in Headers */,
                                DCB341FE1D8A2BAD0054D16E /* context.h in Headers */,
                                DCB342051D8A2BAD0054D16E /* cssmcert.h in Headers */,
                                DCB3421B1D8A2BAD0054D16E /* cssmtrust.h in Headers */,
                                DCB341FE1D8A2BAD0054D16E /* context.h in Headers */,


@@ -23261,6 +27412,7 @@
                                DCB3439C1D8A32A20054D16E /* SecImportExportOpenSSH.h in Headers */,
                                DCB343A61D8A32A20054D16E /* SecPkcs8Templates.h in Headers */,
                                DCB343461D8A32A20054D16E /* ExtendedAttribute.h in Headers */,
                                DCB3439C1D8A32A20054D16E /* SecImportExportOpenSSH.h in Headers */,
                                DCB343A61D8A32A20054D16E /* SecPkcs8Templates.h in Headers */,
                                DCB343461D8A32A20054D16E /* ExtendedAttribute.h in Headers */,

+                               6C2D463E24C88AA60015C3C9 /* LegacyAPICounts.h in Headers */,

                                DCB343601D8A32A20054D16E /* Trust.h in Headers */,
                                DCB3437B1D8A32A20054D16E /* PrimaryKey.h in Headers */,
                                DCB343911D8A32A20054D16E /* TokenLogin.h in Headers */,
                                DCB343601D8A32A20054D16E /* Trust.h in Headers */,
                                DCB3437B1D8A32A20054D16E /* PrimaryKey.h in Headers */,
                                DCB343911D8A32A20054D16E /* TokenLogin.h in Headers */,


@@ -23401,7 +27553,6 @@
                                DCD068191D8CDF7E007602F1 /* SecCodePriv.h in Headers */,
                                DCD0690A1D8CDFFE007602F1 /* InputBuffer.hpp in Headers */,
                                DCD069011D8CDFFE007602F1 /* CharScanner.hpp in Headers */,
                                DCD068191D8CDF7E007602F1 /* SecCodePriv.h in Headers */,
                                DCD0690A1D8CDFFE007602F1 /* InputBuffer.hpp in Headers */,
                                DCD069011D8CDFFE007602F1 /* CharScanner.hpp in Headers */,

-                               DCD068511D8CDF7E007602F1 /* csgeneric.h in Headers */,

                                DCD0687C1D8CDF7E007602F1 /* dirscanner.h in Headers */,
                                DCD068831D8CDF7E007602F1 /* SecAssessment.h in Headers */,
                                DCD068531D8CDF7E007602F1 /* diskrep.h in Headers */,
                                DCD0687C1D8CDF7E007602F1 /* dirscanner.h in Headers */,
                                DCD068831D8CDF7E007602F1 /* SecAssessment.h in Headers */,
                                DCD068531D8CDF7E007602F1 /* diskrep.h in Headers */,


@@ -23449,7 +27600,6 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCD06A521D8CE29C007602F1 /* SecCodeHostLib.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -23457,13 +27607,11 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCD06BA41D8E0D7D007602F1 /* machrunloopserver.h in Headers */,

                                DCD06B501D8E0D7D007602F1 /* debugsupport.h in Headers */,
                                DCD06B4C1D8E0D7D007602F1 /* ccaudit.h in Headers */,
                                DCD06B671D8E0D7D007602F1 /* powerwatch.h in Headers */,
                                DCD06B561D8E0D7D007602F1 /* endian.h in Headers */,
                                DCD06BC41D8E0DC2007602F1 /* utilities_dtrace.h in Headers */,
                                DCD06B501D8E0D7D007602F1 /* debugsupport.h in Headers */,
                                DCD06B4C1D8E0D7D007602F1 /* ccaudit.h in Headers */,
                                DCD06B671D8E0D7D007602F1 /* powerwatch.h in Headers */,
                                DCD06B561D8E0D7D007602F1 /* endian.h in Headers */,
                                DCD06BC41D8E0DC2007602F1 /* utilities_dtrace.h in Headers */,

-                               DCD06B711D8E0D7D007602F1 /* streams.h in Headers */,

                                DCD06B7C1D8E0D7D007602F1 /* trackingallocator.h in Headers */,
                                DCD06B691D8E0D7D007602F1 /* refcount.h in Headers */,
                                DCD06BA11D8E0D7D007602F1 /* dyld_cache_format.h in Headers */,
                                DCD06B7C1D8E0D7D007602F1 /* trackingallocator.h in Headers */,
                                DCD06B691D8E0D7D007602F1 /* refcount.h in Headers */,
                                DCD06BA11D8E0D7D007602F1 /* dyld_cache_format.h in Headers */,


@@ -23476,16 +27624,14 @@
                                DCD06B3F1D8E0D7D007602F1 /* FileLockTransaction.h in Headers */,
                                DCD06B9F1D8E0D7D007602F1 /* dyldcache.h in Headers */,
                                DCD06B821D8E0D7D007602F1 /* utilities.h in Headers */,
                                DCD06B3F1D8E0D7D007602F1 /* FileLockTransaction.h in Headers */,
                                DCD06B9F1D8E0D7D007602F1 /* dyldcache.h in Headers */,
                                DCD06B821D8E0D7D007602F1 /* utilities.h in Headers */,

-                               DCD06B521D8E0D7D007602F1 /* devrandom.h in Headers */,

                                DCD06B751D8E0D7D007602F1 /* threading.h in Headers */,
                                DCD06B611D8E0D7D007602F1 /* logging.h in Headers */,
                                DCD06B471D8E0D7D007602F1 /* alloc.h in Headers */,
                                DCD06B731D8E0D7D007602F1 /* superblob.h in Headers */,
                                DCD06B751D8E0D7D007602F1 /* threading.h in Headers */,
                                DCD06B611D8E0D7D007602F1 /* logging.h in Headers */,
                                DCD06B471D8E0D7D007602F1 /* alloc.h in Headers */,
                                DCD06B731D8E0D7D007602F1 /* superblob.h in Headers */,

-                               DCD06B991D8E0D7D007602F1 /* mach_notify.h in Headers */,

                                DCD06B491D8E0D7D007602F1 /* blob.h in Headers */,
                                DCD06B911D8E0D7D007602F1 /* unix++.h in Headers */,
                                DCD06B9D1D8E0D7D007602F1 /* macho++.h in Headers */,
                                DCD06B491D8E0D7D007602F1 /* blob.h in Headers */,
                                DCD06B911D8E0D7D007602F1 /* unix++.h in Headers */,
                                DCD06B9D1D8E0D7D007602F1 /* macho++.h in Headers */,

-                               DCD06B951D8E0D7D007602F1 /* vproc++.h in Headers */,
+                               5F4C22012489C6AC00F0C425 /* simulatecrash_assert.h in Headers */,

                                DCD06BAA1D8E0D7D007602F1 /* cfmunge.h in Headers */,
                                DCD06B6A1D8E0D7D007602F1 /* seccfobject.h in Headers */,
                                DC2670F21F3E6EC500816EED /* debugging.h in Headers */,
                                DCD06BAA1D8E0D7D007602F1 /* cfmunge.h in Headers */,
                                DCD06B6A1D8E0D7D007602F1 /* seccfobject.h in Headers */,
                                DC2670F21F3E6EC500816EED /* debugging.h in Headers */,


@@ -23510,6 +27656,7 @@
                                DCD06B841D8E0D7D007602F1 /* utility_config.h in Headers */,
                                DCD06B8D1D8E0D7D007602F1 /* pcsc++.h in Headers */,
                                DCD06B9B1D8E0D7D007602F1 /* cfmach++.h in Headers */,
                                DCD06B841D8E0D7D007602F1 /* utility_config.h in Headers */,
                                DCD06B8D1D8E0D7D007602F1 /* pcsc++.h in Headers */,
                                DCD06B9B1D8E0D7D007602F1 /* cfmach++.h in Headers */,

+                               A6BF3B3623EB95F0009AF079 /* entitlements.h in Headers */,

                                DCD06B441D8E0D7D007602F1 /* crc.h in Headers */,
                                DCD06B6D1D8E0D7D007602F1 /* simpleprefs.h in Headers */,
                                DCD06B8B1D8E0D7D007602F1 /* muscle++.h in Headers */,
                                DCD06B441D8E0D7D007602F1 /* crc.h in Headers */,
                                DCD06B6D1D8E0D7D007602F1 /* simpleprefs.h in Headers */,
                                DCD06B8B1D8E0D7D007602F1 /* muscle++.h in Headers */,


@@ -23546,7 +27693,6 @@
                                DCD8A15F1E09EE0F00E4FA0A /* SOSCirclePriv.h in Headers */,
                                DCD8A1601E09EE0F00E4FA0A /* SOSCircleRings.h in Headers */,
                                DCD8A1611E09EE0F00E4FA0A /* SOSCircleV2.h in Headers */,
                                DCD8A15F1E09EE0F00E4FA0A /* SOSCirclePriv.h in Headers */,
                                DCD8A1601E09EE0F00E4FA0A /* SOSCircleRings.h in Headers */,
                                DCD8A1611E09EE0F00E4FA0A /* SOSCircleV2.h in Headers */,

-                               DCD8A1621E09EE0F00E4FA0A /* SOSCloudCircle.h in Headers */,

                                0CE760501E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h in Headers */,
                                DCD8A1631E09EE0F00E4FA0A /* SOSCloudCircleInternal.h in Headers */,
                                DCD8A1641E09EE0F00E4FA0A /* SOSCloudKeychainClient.h in Headers */,
                                0CE760501E1301DC00B4381E /* SOSAccountTrustClassic+Expansion.h in Headers */,
                                DCD8A1631E09EE0F00E4FA0A /* SOSCloudCircleInternal.h in Headers */,
                                DCD8A1641E09EE0F00E4FA0A /* SOSCloudKeychainClient.h in Headers */,


@@ -23560,30 +27706,30 @@
                                DCD8A16F1E09EE0F00E4FA0A /* SOSKVSKeys.h in Headers */,
                                DCD8A1741E09EE0F00E4FA0A /* SOSPeerInfo.h in Headers */,
                                DCD8A17C1E09EE0F00E4FA0A /* SOSPlatform.h in Headers */,
                                DCD8A16F1E09EE0F00E4FA0A /* SOSKVSKeys.h in Headers */,
                                DCD8A1741E09EE0F00E4FA0A /* SOSPeerInfo.h in Headers */,
                                DCD8A17C1E09EE0F00E4FA0A /* SOSPlatform.h in Headers */,

-                               DCD8A17D1E09EE0F00E4FA0A /* SOSRing.h in Headers */,
-                               DCD8A17E1E09EE0F00E4FA0A /* SOSRingBackup.h in Headers */,

                                DCD8A17F1E09EE0F00E4FA0A /* SOSKeyedPubKeyIdentifier.h in Headers */,
                                DCD8A1801E09EE0F00E4FA0A /* SOSRingBasic.h in Headers */,
                                DCD8A1821E09EE0F00E4FA0A /* SOSAccountGhost.h in Headers */,
                                DCD8A1E01E09F76800E4FA0A /* SOSPeerInfoRingState.h in Headers */,
                                DCD8A17F1E09EE0F00E4FA0A /* SOSKeyedPubKeyIdentifier.h in Headers */,
                                DCD8A1801E09EE0F00E4FA0A /* SOSRingBasic.h in Headers */,
                                DCD8A1821E09EE0F00E4FA0A /* SOSAccountGhost.h in Headers */,
                                DCD8A1E01E09F76800E4FA0A /* SOSPeerInfoRingState.h in Headers */,

-                               DCD8A1831E09EE0F00E4FA0A /* SOSRingConcordanceTrust.h in Headers */,
-                               DCD8A1841E09EE0F00E4FA0A /* SOSRecoveryKeyBag.h in Headers */,

                                DCD8A1851E09EE0F00E4FA0A /* SOSRingDER.h in Headers */,
                                DCD8A1861E09EE0F00E4FA0A /* SOSRingPeerInfoUtils.h in Headers */,
                                0CE760521E1314F700B4381E /* SOSAccountTrustClassic+Identity.h in Headers */,
                                DCD8A1851E09EE0F00E4FA0A /* SOSRingDER.h in Headers */,
                                DCD8A1861E09EE0F00E4FA0A /* SOSRingPeerInfoUtils.h in Headers */,
                                0CE760521E1314F700B4381E /* SOSAccountTrustClassic+Identity.h in Headers */,

-                               DCD8A1871E09EE0F00E4FA0A /* SOSRingTypes.h in Headers */,

                                DCD8A1DF1E09F76000E4FA0A /* SOSPeerInfoCollections.h in Headers */,
                                DCD8A1891E09EE0F00E4FA0A /* SOSRingUtils.h in Headers */,
                                DCD8A18A1E09EE0F00E4FA0A /* SOSRingV0.h in Headers */,
                                DCD8A1DF1E09F76000E4FA0A /* SOSPeerInfoCollections.h in Headers */,
                                DCD8A1891E09EE0F00E4FA0A /* SOSRingUtils.h in Headers */,
                                DCD8A18A1E09EE0F00E4FA0A /* SOSRingV0.h in Headers */,

-                               DCD8A18B1E09EE0F00E4FA0A /* SOSTransport.h in Headers */,

                                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */,
                                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */,

-                               DCD8A1901E09EE0F00E4FA0A /* SOSAccountTrust.h in Headers */,

                                DCD8A1DE1E09F74700E4FA0A /* SOSPeerInfoV2.h in Headers */,
                                DCD8A1931E09EE0F00E4FA0A /* SOSTypes.h in Headers */,
                                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                DCD8A1DE1E09F74700E4FA0A /* SOSPeerInfoV2.h in Headers */,
                                DCD8A1931E09EE0F00E4FA0A /* SOSTypes.h in Headers */,
                                DCD8A1951E09EE0F00E4FA0A /* SOSViews.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DCF216D321ADD5B10029CCC1 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCF7830D1D88B4DE00E694BB /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                DCF7830D1D88B4DE00E694BB /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -23592,7 +27738,6 @@
                                DCF784011D88B60D00E694BB /* rc4Context.h in Headers */,
                                DCF784E31D88B62E00E694BB /* opensslv_legacy.h in Headers */,
                                DCF783F61D88B60D00E694BB /* pkcs8.h in Headers */,
                                DCF784011D88B60D00E694BB /* rc4Context.h in Headers */,
                                DCF784E31D88B62E00E694BB /* opensslv_legacy.h in Headers */,
                                DCF783F61D88B60D00E694BB /* pkcs8.h in Headers */,

-                               DCF783CE1D88B60D00E694BB /* bsobjects.h in Headers */,

                                DCF783A71D88B60D00E694BB /* rijndaelApi.h in Headers */,
                                DCF7839D1D88B60D00E694BB /* aesCommon.h in Headers */,
                                DCF783EA1D88B60D00E694BB /* pbkdDigest.h in Headers */,
                                DCF783A71D88B60D00E694BB /* rijndaelApi.h in Headers */,
                                DCF7839D1D88B60D00E694BB /* aesCommon.h in Headers */,
                                DCF783EA1D88B60D00E694BB /* pbkdDigest.h in Headers */,


@@ -23614,7 +27759,6 @@
                                DCF783F81D88B60D00E694BB /* bfContext.h in Headers */,
                                DCF783AA1D88B60D00E694BB /* AppleCSP.h in Headers */,
                                DCF783AD1D88B60D00E694BB /* AppleCSPContext.h in Headers */,
                                DCF783F81D88B60D00E694BB /* bfContext.h in Headers */,
                                DCF783AA1D88B60D00E694BB /* AppleCSP.h in Headers */,
                                DCF783AD1D88B60D00E694BB /* AppleCSPContext.h in Headers */,

-                               DCF783CC1D88B60D00E694BB /* bsafePKCS1.h in Headers */,

                                DCF783B41D88B60D00E694BB /* BinaryKey.h in Headers */,
                                DCF783BD1D88B60D00E694BB /* MacContext.h in Headers */,
                                DCF7839F1D88B60D00E694BB /* aescspi.h in Headers */,
                                DCF783B41D88B60D00E694BB /* BinaryKey.h in Headers */,
                                DCF783BD1D88B60D00E694BB /* MacContext.h in Headers */,
                                DCF7839F1D88B60D00E694BB /* aescspi.h in Headers */,


@@ -23637,7 +27781,6 @@
                                DCF783BB1D88B60D00E694BB /* DigestContext.h in Headers */,
                                DCF783DC1D88B60D00E694BB /* FEEKeys.h in Headers */,
                                DCF784DB1D88B62E00E694BB /* e_os.h in Headers */,
                                DCF783BB1D88B60D00E694BB /* DigestContext.h in Headers */,
                                DCF783DC1D88B60D00E694BB /* FEEKeys.h in Headers */,
                                DCF784DB1D88B62E00E694BB /* e_os.h in Headers */,

-                               DCF783C91D88B60D00E694BB /* bsafecspi.h in Headers */,

                                DCF784D71D88B62E00E694BB /* cast_legacy.h in Headers */,
                                DCF783C01D88B60D00E694BB /* SignatureContext.h in Headers */,
                                DCF783D31D88B60D00E694BB /* ascFactory.h in Headers */,
                                DCF784D71D88B62E00E694BB /* cast_legacy.h in Headers */,
                                DCF783C01D88B60D00E694BB /* SignatureContext.h in Headers */,
                                DCF783D31D88B60D00E694BB /* ascFactory.h in Headers */,


@@ -23656,7 +27799,6 @@
                                DCF784EA1D88B62E00E694BB /* x509_legacy.h in Headers */,
                                DCF783B81D88B60D00E694BB /* cspdebugging.h in Headers */,
                                DCF784D31D88B62E00E694BB /* bio_legacy.h in Headers */,
                                DCF784EA1D88B62E00E694BB /* x509_legacy.h in Headers */,
                                DCF783B81D88B60D00E694BB /* cspdebugging.h in Headers */,
                                DCF784D31D88B62E00E694BB /* bio_legacy.h in Headers */,

-                               DCF783C81D88B60D00E694BB /* bsafecsp.h in Headers */,

                                DCF784D21D88B62E00E694BB /* asn1_legacy.h in Headers */,
                                DCF784DF1D88B62E00E694BB /* lhash_legacy.h in Headers */,
                                DCF7840F1D88B60D00E694BB /* RSA_asymmetric.h in Headers */,
                                DCF784D21D88B62E00E694BB /* asn1_legacy.h in Headers */,
                                DCF784DF1D88B62E00E694BB /* lhash_legacy.h in Headers */,
                                DCF7840F1D88B60D00E694BB /* RSA_asymmetric.h in Headers */,


@@ -23759,6 +27901,22 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               E060D1972124780E0025B833 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               E060D1C7212478120025B833 /* OctagonTestHarness.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1A22124780F0025B833 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               E060D24821247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                E7D847C21C6BE9710025BB44 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                E7D847C21C6BE9710025BB44 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;


@@ -23770,6 +27928,7 @@
                                EB413B821E663AFA00592085 /* PairingChannel.h in Headers */,
                                E7F480121C729C7B00390FDB /* NSError+KCCreationHelpers.h in Headers */,
                                E7E3EFE31CBC195700E79A5D /* KCAccountKCCircleDelegate.h in Headers */,
                                EB413B821E663AFA00592085 /* PairingChannel.h in Headers */,
                                E7F480121C729C7B00390FDB /* NSError+KCCreationHelpers.h in Headers */,
                                E7E3EFE31CBC195700E79A5D /* KCAccountKCCircleDelegate.h in Headers */,

+                               5A47FFBA228F60DF00F781B8 /* KCInitialMessageData.h in Headers */,

                                E794BB011C759B1200339A0F /* KCJoiningMessages.h in Headers */,
                                E71454EF1C741E0800B5B20B /* KCError.h in Headers */,
                                E7F482961C74FDF800390FDB /* KCJoiningSession.h in Headers */,
                                E794BB011C759B1200339A0F /* KCJoiningMessages.h in Headers */,
                                E71454EF1C741E0800B5B20B /* KCError.h in Headers */,
                                E7F482961C74FDF800390FDB /* KCJoiningSession.h in Headers */,


@@ -23777,21 +27936,23 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               EBCE16631FE7366D002E7CCC /* Headers */ = {
+               EB695289223B75C300F02C1C /* Headers */ = {

                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               EBCE16681FE736AD002E7CCC /* DeviceSimulatorProtocol.h in Headers */,
-                               EBCE16641FE73679002E7CCC /* MultiDeviceNetworkingProtocol.h in Headers */,
+                               EB69528A223B75C300F02C1C /* SFKeychainServer.h in Headers */,
+                               EB69528B223B75C300F02C1C /* SecItemBackupServer.h in Headers */,
+                               EB69528C223B75C300F02C1C /* SecCDKeychain.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               EBCE16651FE7368C002E7CCC /* Headers */ = {
+               EB8908A421F186FE00F0DDDB /* Headers */ = {

                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               EBCE16661FE736A1002E7CCC /* MultiDeviceNetworkingProtocol.h in Headers */,
-                               EBCE16671FE736A5002E7CCC /* DeviceSimulatorProtocol.h in Headers */,
+                               EB8908A621F1871800F0DDDB /* SFKeychainServer.h in Headers */,
+                               EB8908B321F18E3200F0DDDB /* SecItemBackupServer.h in Headers */,
+                               EB8908A521F1870800F0DDDB /* SecCDKeychain.h in Headers */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -23967,20 +28128,6 @@
                        passBuildSettingsInEnvironment = 1;
                        productName = "--- Daemons ---";
                };
                        passBuildSettingsInEnvironment = 1;
                        productName = "--- Daemons ---";
                };

-               EBBE20571C21380100B7A639 /* SecurityFeatures */ = {
-                       isa = PBXLegacyTarget;
-                       buildArgumentsString = "$(PROJECT_DIR)/SecurityFeatures/ExternalProject.sh $(ACTION)";
-                       buildConfigurationList = EBBE20581C21380200B7A639 /* Build configuration list for PBXLegacyTarget "SecurityFeatures" */;
-                       buildPhases = (
-                       );
-                       buildToolPath = /bin/bash;
-                       buildWorkingDirectory = "$(PROJECT_DIR)/SecurityFeatures";
-                       dependencies = (
-                       );
-                       name = SecurityFeatures;
-                       passBuildSettingsInEnvironment = 1;
-                       productName = SecurityFeatures;
-               };

 /* End PBXLegacyTarget section */
 
 /* Begin PBXNativeTarget section */
 /* End PBXLegacyTarget section */
 
 /* Begin PBXNativeTarget section */


@@ -23995,12 +28142,13 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               DCD6BF5A21E919A60015F7A8 /* PBXTargetDependency */,

                                D40B6A8C1E2B63D100CD6EE5 /* PBXTargetDependency */,
                                DC00ABD11D821F1A00513D74 /* PBXTargetDependency */,
                                DC00ABD31D821F1D00513D74 /* PBXTargetDependency */,
                                DCD8A1EF1E09F8BC00E4FA0A /* PBXTargetDependency */,
                                DC65E75A1D8CB48900152EF0 /* PBXTargetDependency */,
                                D40B6A8C1E2B63D100CD6EE5 /* PBXTargetDependency */,
                                DC00ABD11D821F1A00513D74 /* PBXTargetDependency */,
                                DC00ABD31D821F1D00513D74 /* PBXTargetDependency */,
                                DCD8A1EF1E09F8BC00E4FA0A /* PBXTargetDependency */,
                                DC65E75A1D8CB48900152EF0 /* PBXTargetDependency */,

-                               DC59E9A91D91C7CC001BDDF5 /* PBXTargetDependency */,
+                               D437185921166FC800EA350A /* PBXTargetDependency */,

                                DC65E75C1D8CB49200152EF0 /* PBXTargetDependency */,
                                DC52EDFC1D80D67C00B0A59C /* PBXTargetDependency */,
                                DC00ABD51D821F2700513D74 /* PBXTargetDependency */,
                                DC65E75C1D8CB49200152EF0 /* PBXTargetDependency */,
                                DC52EDFC1D80D67C00B0A59C /* PBXTargetDependency */,
                                DC00ABD51D821F2700513D74 /* PBXTargetDependency */,


@@ -24057,7 +28205,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

-                               0C85DFD41FB38BB6000343A7 /* PBXTargetDependency */,
+                               DC3E18CA212501C200073D80 /* PBXTargetDependency */,

                                0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */,
                                0C85DFDA1FB38BB6000343A7 /* PBXTargetDependency */,
                                0C85DFDC1FB38BB6000343A7 /* PBXTargetDependency */,
                                0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */,
                                0C85DFDA1FB38BB6000343A7 /* PBXTargetDependency */,
                                0C85DFDC1FB38BB6000343A7 /* PBXTargetDependency */,


@@ -24075,7 +28223,7 @@
                        buildPhases = (
                                0C8BBEFE1FCB446400580909 /* Sources */,
                                0C8BBF021FCB446400580909 /* Frameworks */,
                        buildPhases = (
                                0C8BBEFE1FCB446400580909 /* Sources */,
                                0C8BBF021FCB446400580909 /* Frameworks */,

-                               0C8BBF041FCB446400580909 /* CopyFiles */,
+                               0C8BBF041FCB446400580909 /* Install man1 pages */,

                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );


@@ -24086,42 +28234,43 @@
                        productReference = 0C8BBF081FCB446400580909 /* otctl */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = 0C8BBF081FCB446400580909 /* otctl */;
                        productType = "com.apple.product-type.tool";
                };

-               0C9AEEAB20783FBB00BF6237 /* SignInAnalyticsTests_osx */ = {
+               0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 0C9AEEB420783FBB00BF6237 /* Build configuration list for PBXNativeTarget "SignInAnalyticsTests_osx" */;
+                       buildConfigurationList = 0CCC227623F357EE00E1FCD0 /* Build configuration list for PBXNativeTarget "OctagonTrustTests" */;

                        buildPhases = (
                        buildPhases = (

-                               0C9AEEAE20783FBB00BF6237 /* Sources */,
-                               0C9AEEB020783FBB00BF6237 /* Frameworks */,
-                               0C9AEEB320783FBB00BF6237 /* Embed OCMock */,
+                               0CCC220B23F357EE00E1FCD0 /* Sources */,
+                               0CCC226123F357EE00E1FCD0 /* Frameworks */,
+                               0CCC227423F357EE00E1FCD0 /* Resources */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

-                               0C9AEEBA20783FE000BF6237 /* PBXTargetDependency */,
-                       );
-                       name = SignInAnalyticsTests_osx;
-                       productName = CKKSTests;
-                       productReference = 0C9AEEB720783FBB00BF6237 /* SignInAnalyticsTests_osx.xctest */;
+                               0C7EB14F23F3D1480089097B /* PBXTargetDependency */,
+                               0C7EB14D23F3D13C0089097B /* PBXTargetDependency */,
+                               0CCC22AD23F38B0E00E1FCD0 /* PBXTargetDependency */,
+                               0CCC22AB23F38B0600E1FCD0 /* PBXTargetDependency */,
+                       );
+                       name = OctagonTrustTests;
+                       productName = TrustedPeersHelperUnitTests;
+                       productReference = 0CCC227923F357EE00E1FCD0 /* OctagonTrustTests.xctest */;

                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productType = "com.apple.product-type.bundle.unit-test";
                };

-               0CF406042072E3E3003D6A7F /* SignInAnalyticsTests_ios */ = {
+               0CD743A523C3EC8000FA0EC5 /* OctagonTrust */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 0CF4064D2072E3E3003D6A7F /* Build configuration list for PBXNativeTarget "SignInAnalyticsTests_ios" */;
+                       buildConfigurationList = 0CD743AB23C3EC8000FA0EC5 /* Build configuration list for PBXNativeTarget "OctagonTrust" */;

                        buildPhases = (
                        buildPhases = (

-                               0CF406112072E3E3003D6A7F /* Sources */,
-                               0CF406342072E3E3003D6A7F /* Frameworks */,
-                               0CF4064A2072E3E3003D6A7F /* Embed OCMock */,
+                               0CD743A123C3EC8000FA0EC5 /* Headers */,
+                               0CD743A223C3EC8000FA0EC5 /* Sources */,
+                               0CD743A323C3EC8000FA0EC5 /* Frameworks */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

-                               0C5663EE20BE2E1A0035F362 /* PBXTargetDependency */,
-                               0C3E2EA92073F5C400F5B95B /* PBXTargetDependency */,

                        );
                        );

-                       name = SignInAnalyticsTests_ios;
-                       productName = CKKSTests;
-                       productReference = 0CF406502072E3E3003D6A7F /* SignInAnalyticsTests_ios.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
+                       name = OctagonTrust;
+                       productName = Clique;
+                       productReference = 0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */;
+                       productType = "com.apple.product-type.framework";

                };
                225394AC1E3080A600D3CD9B /* security_codesigning_ios */ = {
                        isa = PBXNativeTarget;
                };
                225394AC1E3080A600D3CD9B /* security_codesigning_ios */ = {
                        isa = PBXNativeTarget;


@@ -24141,33 +28290,52 @@
                        productReference = 225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = 225394B41E3080A600D3CD9B /* libsecurity_codesigning_ios.a */;
                        productType = "com.apple.product-type.library.static";
                };

-               3DD1FEF5201C07F30086D049 /* SecureTransport_macos_tests */ = {
+               3D58392D21890FFB000ACA44 /* SecExperimentTests */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 3DD1FF4A201C07F30086D049 /* Build configuration list for PBXNativeTarget "SecureTransport_macos_tests" */;
+                       buildConfigurationList = 3D58394A21890FFB000ACA44 /* Build configuration list for PBXNativeTarget "SecExperimentTests" */;
+                       buildPhases = (
+                               3D58393021890FFB000ACA44 /* Sources */,
+                               3D58393E21890FFB000ACA44 /* Frameworks */,
+                               3D58394821890FFB000ACA44 /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = SecExperimentTests;
+                       productName = CKKSTests;
+                       productReference = 3D58394D21890FFB000ACA44 /* SecExperimentTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
+               3DD1FEF5201C07F30086D049 /* SecureTransportTests_macos */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 3DD1FF4A201C07F30086D049 /* Build configuration list for PBXNativeTarget "SecureTransportTests_macos" */;

                        buildPhases = (
                                3DD1FF02201C07F30086D049 /* Sources */,
                                3DD1FF2F201C07F30086D049 /* Frameworks */,
                                3DD1FFD6201FF7930086D049 /* CopyFiles */,
                                3DD1FF49201C07F30086D049 /* ShellScript */,
                        buildPhases = (
                                3DD1FF02201C07F30086D049 /* Sources */,
                                3DD1FF2F201C07F30086D049 /* Frameworks */,
                                3DD1FFD6201FF7930086D049 /* CopyFiles */,
                                3DD1FF49201C07F30086D049 /* ShellScript */,

+                               AAE7D3202161CCE50054245E /* CopyFiles */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                                3DD1FF50201C09CD0086D049 /* PBXTargetDependency */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                                3DD1FF50201C09CD0086D049 /* PBXTargetDependency */,

-                               3DD1FEF8201C07F30086D049 /* PBXTargetDependency */,
+                               3DD258A2204B7DA800F5DA78 /* PBXTargetDependency */,

                        );
                        );

-                       name = SecureTransport_macos_tests;
+                       name = SecureTransportTests_macos;

                        productName = CKKSTests;
                        productReference = 3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productName = CKKSTests;
                        productReference = 3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

-               3DD1FFAC201FDB1D0086D049 /* SecureTransport_ios_tests */ = {
+               3DD1FFAC201FDB1D0086D049 /* SecureTransportTests_ios */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 3DD1FFCD201FDB1D0086D049 /* Build configuration list for PBXNativeTarget "SecureTransport_ios_tests" */;
+                       buildConfigurationList = 3DD1FFCD201FDB1D0086D049 /* Build configuration list for PBXNativeTarget "SecureTransportTests_ios" */;

                        buildPhases = (
                                3DD1FFB3201FDB1D0086D049 /* Sources */,
                                3DD1FFC3201FDB1D0086D049 /* Frameworks */,
                        buildPhases = (
                                3DD1FFB3201FDB1D0086D049 /* Sources */,
                                3DD1FFC3201FDB1D0086D049 /* Frameworks */,

-                               3DD1FFD3201FF72C0086D049 /* CopyFiles */,
+                               AA0DA47C21E818C1009F1C74 /* CopyFiles */,
+                               3DD1FFD3201FF72C0086D049 /* Copy Plist */,

                                3DD1FFCC201FDB1D0086D049 /* ShellScript */,
                        );
                        buildRules = (
                                3DD1FFCC201FDB1D0086D049 /* ShellScript */,
                        );
                        buildRules = (


@@ -24176,11 +28344,43 @@
                                3DD1FFAF201FDB1D0086D049 /* PBXTargetDependency */,
                                3DD1FFB1201FDB1D0086D049 /* PBXTargetDependency */,
                        );
                                3DD1FFAF201FDB1D0086D049 /* PBXTargetDependency */,
                                3DD1FFB1201FDB1D0086D049 /* PBXTargetDependency */,
                        );

-                       name = SecureTransport_ios_tests;
+                       name = SecureTransportTests_ios;

                        productName = CKKSTests;
                        productReference = 3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productName = CKKSTests;
                        productReference = 3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

+               3E4D49B32531170600B124B3 /* secsecstaticcodeapitest */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 3E4D49B92531170600B124B3 /* Build configuration list for PBXNativeTarget "secsecstaticcodeapitest" */;
+                       buildPhases = (
+                               3E4D49B42531170600B124B3 /* Sources */,
+                               3E4D49B62531170600B124B3 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = secsecstaticcodeapitest;
+                       productName = secbackupntest;
+                       productReference = 3E4D49BC2531170600B124B3 /* secsecstaticcodeapitest */;
+                       productType = "com.apple.product-type.tool";
+               };
+               3E88360824F068EF00E9F4D6 /* secseccodeapitest */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 3E88360E24F068EF00E9F4D6 /* Build configuration list for PBXNativeTarget "secseccodeapitest" */;
+                       buildPhases = (
+                               3E88360924F068EF00E9F4D6 /* Sources */,
+                               3E88360B24F068EF00E9F4D6 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = secseccodeapitest;
+                       productName = secbackupntest;
+                       productReference = 3E88361124F068EF00E9F4D6 /* secseccodeapitest */;
+                       productType = "com.apple.product-type.tool";
+               };

                4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 438169381B4EDCBD00C54D58 /* Build configuration list for PBXNativeTarget "SOSCCAuthPlugin" */;
                4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 438169381B4EDCBD00C54D58 /* Build configuration list for PBXNativeTarget "SOSCCAuthPlugin" */;


@@ -24221,12 +28421,13 @@
                        buildPhases = (
                                4718AE0F205B39620068EC3F /* Sources */,
                                4718AE17205B39620068EC3F /* Frameworks */,
                        buildPhases = (
                                4718AE0F205B39620068EC3F /* Sources */,
                                4718AE17205B39620068EC3F /* Frameworks */,

-                               4718AE26205B39620068EC3F /* CopyFiles */,
-                               4718AE28205B39620068EC3F /* CopyFiles */,
+                               4718AE26205B39620068EC3F /* Launchd plists */,
+                               4718AE28205B39620068EC3F /* Copy Logging Files */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

+                               DC3E18CE2125024C00073D80 /* PBXTargetDependency */,

                                4718AEE6205B3A350068EC3F /* PBXTargetDependency */,
                                4718AE03205B39620068EC3F /* PBXTargetDependency */,
                                4718AE05205B39620068EC3F /* PBXTargetDependency */,
                                4718AEE6205B3A350068EC3F /* PBXTargetDependency */,
                                4718AE03205B39620068EC3F /* PBXTargetDependency */,
                                4718AE05205B39620068EC3F /* PBXTargetDependency */,


@@ -24246,9 +28447,9 @@
                                4718AE2F205B39C40068EC3F /* Sources */,
                                4718AE9C205B39C40068EC3F /* Frameworks */,
                                4718AE9D205B39C40068EC3F /* Headers */,
                                4718AE2F205B39C40068EC3F /* Sources */,
                                4718AE9C205B39C40068EC3F /* Frameworks */,
                                4718AE9D205B39C40068EC3F /* Headers */,

+                               4718AEDC205B39C40068EC3F /* CopyFiles */,

                        );
                        buildRules = (
                        );
                        buildRules = (

-                               4718AEDE205B39C40068EC3F /* PBXBuildRule */,

                        );
                        dependencies = (
                        );
                        );
                        dependencies = (
                        );


@@ -24257,9 +28458,9 @@
                        productReference = 4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = 4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */;
                        productType = "com.apple.product-type.library.static";
                };

-               4727FBB61F9918580003AE36 /* secdxctests_ios */ = {
+               4727FBB61F9918580003AE36 /* secdxctests */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests_ios" */;
+                       buildConfigurationList = 4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests" */;

                        buildPhases = (
                                4727FBB31F9918580003AE36 /* Sources */,
                                4727FBB41F9918580003AE36 /* Frameworks */,
                        buildPhases = (
                                4727FBB31F9918580003AE36 /* Sources */,
                                4727FBB41F9918580003AE36 /* Frameworks */,


@@ -24268,14 +28469,19 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               6CE2AEAB22B2C1BE00C96AE7 /* PBXTargetDependency */,
+                               6CC638EB226695C300E5DB0B /* PBXTargetDependency */,
+                               6CC638ED226695C300E5DB0B /* PBXTargetDependency */,
+                               D4BFFD692227B30700163B4B /* PBXTargetDependency */,
+                               EB74CBD622077CC600F1BBAD /* PBXTargetDependency */,

                                47A6FC6A206B461700BD6C54 /* PBXTargetDependency */,
                                47DE88D91FA7ADBB00DD3254 /* PBXTargetDependency */,
                                47DE88D71FA7ADAC00DD3254 /* PBXTargetDependency */,
                                47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */,
                        );
                                47A6FC6A206B461700BD6C54 /* PBXTargetDependency */,
                                47DE88D91FA7ADBB00DD3254 /* PBXTargetDependency */,
                                47DE88D71FA7ADAC00DD3254 /* PBXTargetDependency */,
                                47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */,
                        );

-                       name = secdxctests_ios;
+                       name = secdxctests;

                        productName = secdxctests;
                        productName = secdxctests;

-                       productReference = 4727FBB71F9918580003AE36 /* secdxctests_ios.xctest */;
+                       productReference = 4727FBB71F9918580003AE36 /* secdxctests.xctest */;

                        productType = "com.apple.product-type.bundle.unit-test";
                };
                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */ = {
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */ = {


@@ -24329,30 +28535,6 @@
                        productReference = 4771D972209A755800BA9772 /* KeychainDataclassOwner.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
                        productReference = 4771D972209A755800BA9772 /* KeychainDataclassOwner.bundle */;
                        productType = "com.apple.product-type.bundle";
                };

-               478D426C1FD72A8100CAB645 /* secdxctests_mac */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 478D42991FD72A8100CAB645 /* Build configuration list for PBXNativeTarget "secdxctests_mac" */;
-                       buildPhases = (
-                               478D42751FD72A8100CAB645 /* Sources */,
-                               478D427D1FD72A8100CAB645 /* Frameworks */,
-                               090585D020AEF9D300BB7490 /* Install OCMock framework */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               47A6FC6C206B462400BD6C54 /* PBXTargetDependency */,
-                               DC34CD3620326C3B00302481 /* PBXTargetDependency */,
-                               DC34CD3420326C3100302481 /* PBXTargetDependency */,
-                               DC34CD2D20326C2C00302481 /* PBXTargetDependency */,
-                               478D426D1FD72A8100CAB645 /* PBXTargetDependency */,
-                               478D426F1FD72A8100CAB645 /* PBXTargetDependency */,
-                               478D42731FD72A8100CAB645 /* PBXTargetDependency */,
-                       );
-                       name = secdxctests_mac;
-                       productName = secdxctests;
-                       productReference = 478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
-               };

                47C2F1822059CB680062DE30 /* KeychainResources */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 47C2F1872059CB690062DE30 /* Build configuration list for PBXNativeTarget "KeychainResources" */;
                47C2F1822059CB680062DE30 /* KeychainResources */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 47C2F1872059CB690062DE30 /* Build configuration list for PBXNativeTarget "KeychainResources" */;


@@ -24376,7 +28558,6 @@
                        buildPhases = (
                                47C51B801EEA657D0032D9E5 /* Sources */,
                                47C51B811EEA657D0032D9E5 /* Frameworks */,
                        buildPhases = (
                                47C51B801EEA657D0032D9E5 /* Sources */,
                                47C51B811EEA657D0032D9E5 /* Frameworks */,

-                               47C51B821EEA657D0032D9E5 /* Resources */,

                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );


@@ -24398,14 +28579,16 @@
                                4C32C0AB0A4975F6002891BD /* Resources */,
                                4C32C0AC0A4975F6002891BD /* Sources */,
                                4C32C0AD0A4975F6002891BD /* Frameworks */,
                                4C32C0AB0A4975F6002891BD /* Resources */,
                                4C32C0AC0A4975F6002891BD /* Sources */,
                                4C32C0AD0A4975F6002891BD /* Frameworks */,

-                               5EE098DE1CD21661009FCA27 /* Unifdef RC_HIDE_J79/J80 */,
+                               F3384FD12165A025004A2171 /* Install Ariadne Signposts Plist */,
+                               0C97867A235A766B0040A867 /* Copy System logging profile */,

                        );
                        buildRules = (
                                E7B006FF170B56E700B27966 /* PBXBuildRule */,
                        );
                        dependencies = (
                        );
                        buildRules = (
                                E7B006FF170B56E700B27966 /* PBXBuildRule */,
                        );
                        dependencies = (

-                               DC59E9A61D91C710001BDDF5 /* PBXTargetDependency */,
+                               DCDA5E5A2124BA2F009B11B2 /* PBXTargetDependency */,

                                DCD22D7D1D8CCA18001C9B81 /* PBXTargetDependency */,
                                DCD22D7D1D8CCA18001C9B81 /* PBXTargetDependency */,

+                               D42C83A5211636A3008D3D83 /* PBXTargetDependency */,

                                DCD22D7B1D8CCA07001C9B81 /* PBXTargetDependency */,
                                DCD8A19C1E09EEA200E4FA0A /* PBXTargetDependency */,
                                DCC093781D80ABC300F984E4 /* PBXTargetDependency */,
                                DCD22D7B1D8CCA07001C9B81 /* PBXTargetDependency */,
                                DCD8A19C1E09EEA200E4FA0A /* PBXTargetDependency */,
                                DCC093781D80ABC300F984E4 /* PBXTargetDependency */,


@@ -24431,6 +28614,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               873C14B221540FED003C9C00 /* PBXTargetDependency */,

                        );
                        name = CircleJoinRequested;
                        productName = CircleJoinRequested;
                        );
                        name = CircleJoinRequested;
                        productName = CircleJoinRequested;


@@ -24497,12 +28681,12 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9DB2225D14500A802E0 /* PBXTargetDependency */,
+                               D4E0E9D72225023600A802E0 /* PBXTargetDependency */,

                                DCD22D821D8CCB5A001C9B81 /* PBXTargetDependency */,
                                DCD22D841D8CCB72001C9B81 /* PBXTargetDependency */,
                                DCD8A1EC1E09F88400E4FA0A /* PBXTargetDependency */,
                                DC52EC3D1D80CFF000B0A59C /* PBXTargetDependency */,
                                DCD22D821D8CCB5A001C9B81 /* PBXTargetDependency */,
                                DCD22D841D8CCB72001C9B81 /* PBXTargetDependency */,
                                DCD8A1EC1E09F88400E4FA0A /* PBXTargetDependency */,
                                DC52EC3D1D80CFF000B0A59C /* PBXTargetDependency */,

-                               DC52EC201D80CF7400B0A59C /* PBXTargetDependency */,
-                               DC52EAA51D80CCF600B0A59C /* PBXTargetDependency */,

                        );
                        name = securitytool_ios;
                        productName = security;
                        );
                        name = securitytool_ios;
                        productName = security;


@@ -24538,6 +28722,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9DD2225D1E600A802E0 /* PBXTargetDependency */,

                                DC65E72F1D8CB32400152EF0 /* PBXTargetDependency */,
                        );
                        name = CloudKeychainProxy;
                                DC65E72F1D8CB32400152EF0 /* PBXTargetDependency */,
                        );
                        name = CloudKeychainProxy;


@@ -24562,6 +28747,22 @@
                        productReference = 5346480117331E1200FE9172 /* KeychainSyncAccountNotification.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
                        productReference = 5346480117331E1200FE9172 /* KeychainSyncAccountNotification.bundle */;
                        productType = "com.apple.product-type.bundle";
                };

+               5A442F81233C330F00918373 /* experimentTool */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 5A442F8D233C330F00918373 /* Build configuration list for PBXNativeTarget "experimentTool" */;
+                       buildPhases = (
+                               5A442F82233C330F00918373 /* Sources */,
+                               5A442F89233C330F00918373 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = experimentTool;
+                       productName = ckksctl;
+                       productReference = 5A442F90233C330F00918373 /* experimentTool */;
+                       productType = "com.apple.product-type.tool";
+               };

                5E10992419A5E55800A60E2B /* ISACLProtectedItems */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 5E10994D19A5E55800A60E2B /* Build configuration list for PBXNativeTarget "ISACLProtectedItems" */;
                5E10992419A5E55800A60E2B /* ISACLProtectedItems */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 5E10994D19A5E55800A60E2B /* Build configuration list for PBXNativeTarget "ISACLProtectedItems" */;


@@ -24590,6 +28791,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               DC3E18CC2125020400073D80 /* PBXTargetDependency */,

                                D40B6A861E2B5F7600CD6EE5 /* PBXTargetDependency */,
                                DC89998B1E410DBF00E6E604 /* PBXTargetDependency */,
                                DC65E7561D8CB47600152EF0 /* PBXTargetDependency */,
                                D40B6A861E2B5F7600CD6EE5 /* PBXTargetDependency */,
                                DC89998B1E410DBF00E6E604 /* PBXTargetDependency */,
                                DC65E7561D8CB47600152EF0 /* PBXTargetDependency */,


@@ -24603,6 +28805,49 @@
                        productReference = 5EBE247A1B00CCAE0007DB0E /* secacltests */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = 5EBE247A1B00CCAE0007DB0E /* secacltests */;
                        productType = "com.apple.product-type.tool";
                };

+               6C2045E92424BA7E00F9461D /* KeychainStasher */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 6C2045EE2424BA7F00F9461D /* Build configuration list for PBXNativeTarget "KeychainStasher" */;
+                       buildPhases = (
+                               6C2045E62424BA7E00F9461D /* Sources */,
+                               6C2045E72424BA7E00F9461D /* Frameworks */,
+                               6C2045F32424BBB900F9461D /* Install Sandbox Profile */,
+                               6C2045FA2424BCC300F9461D /* Install LaunchAgent plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               6CA9690D24ACC5C100C08B5E /* PBXTargetDependency */,
+                       );
+                       name = KeychainStasher;
+                       productName = KeychainStasher;
+                       productReference = 6C2045EA2424BA7E00F9461D /* KeychainStasher */;
+                       productType = "com.apple.product-type.tool";
+               };
+               6C39234421F13E4D00D018AD /* SecDbBackupTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 6C39237621F13E4D00D018AD /* Build configuration list for PBXNativeTarget "SecDbBackupTests" */;
+                       buildPhases = (
+                               6C39234D21F13E4D00D018AD /* Sources */,
+                               6C39235A21F13E4D00D018AD /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               6CC638E7226695B900E5DB0B /* PBXTargetDependency */,
+                               6CC638E9226695B900E5DB0B /* PBXTargetDependency */,
+                               D4BFFD622227578900163B4B /* PBXTargetDependency */,
+                               D4BFFD602227576E00163B4B /* PBXTargetDependency */,
+                               D4BFFD5E2227575C00163B4B /* PBXTargetDependency */,
+                               D4BFFD5C2227574C00163B4B /* PBXTargetDependency */,
+                               D4BFFD592227574200163B4B /* PBXTargetDependency */,
+                               6CE2AEAD22B2C1C300C96AE7 /* PBXTargetDependency */,
+                       );
+                       name = SecDbBackupTests;
+                       productName = secdxctests;
+                       productReference = 6C39237921F13E4D00D018AD /* SecDbBackupTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */;
                6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */;


@@ -24621,53 +28866,43 @@
                        productReference = 6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productReference = 6C4605B81F882B9B001421B6 /* KeychainAnalyticsTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

-               6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */ = {
+               6C7BE2A923C3DD64003BB2CA /* securitytool_bridge */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 6C98085E1E788AEB00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_mac" */;
+                       buildConfigurationList = 6C7BE2E423C3DD64003BB2CA /* Build configuration list for PBXNativeTarget "securitytool_bridge" */;

                        buildPhases = (
                        buildPhases = (

-                               6C98083D1E788AEB00E70590 /* Sources */,
-                               6C9808481E788AEB00E70590 /* Frameworks */,
-                               6C98085D1E788AEB00E70590 /* Resources */,
+                               6C7BE2B623C3DD64003BB2CA /* Sources */,
+                               6C7BE2D223C3DD64003BB2CA /* Frameworks */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

-                               6C98082F1E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808311E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808351E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808371E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808391E788AEB00E70590 /* PBXTargetDependency */,
-                               6C98083B1E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808A01E788B9400E70590 /* PBXTargetDependency */,
-                       );
-                       name = CKKSCloudKitTests_mac;
-                       productName = CKKSTests;
-                       productReference = 6C9808611E788AEB00E70590 /* CKKSCloudKitTests.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
+                               6C16258423C4FFD40086A0FF /* PBXTargetDependency */,
+                               6C16258623C4FFD40086A0FF /* PBXTargetDependency */,
+                               6C16258123C4FFC40086A0FF /* PBXTargetDependency */,
+                               6C14CA0423C4F6830097B572 /* PBXTargetDependency */,
+                               6C7BE2AA23C3DD64003BB2CA /* PBXTargetDependency */,
+                               6C7BE2AC23C3DD64003BB2CA /* PBXTargetDependency */,
+                       );
+                       name = securitytool_bridge;
+                       productName = security;
+                       productReference = 6C7BE2E723C3DD64003BB2CA /* securitytool_bridge */;
+                       productType = "com.apple.product-type.tool";

                };
                };

-               6C9808681E788AFD00E70590 /* CKKSCloudKitTests_ios */ = {
+               6C963280242A279B00C53CE2 /* stashtester */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 6C98089A1E788AFD00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_ios" */;
+                       buildConfigurationList = 6C963288242A279B00C53CE2 /* Build configuration list for PBXNativeTarget "stashtester" */;

                        buildPhases = (
                        buildPhases = (

-                               6C9808791E788AFD00E70590 /* Sources */,
-                               6C9808841E788AFD00E70590 /* Frameworks */,
-                               6C9808991E788AFD00E70590 /* Resources */,
+                               6C96327D242A279B00C53CE2 /* Sources */,
+                               6C96327E242A279B00C53CE2 /* Frameworks */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

-                               6C9808A41E788CB100E70590 /* PBXTargetDependency */,
-                               6C98086B1E788AFD00E70590 /* PBXTargetDependency */,
-                               6C98086D1E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808711E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808731E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808751E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808771E788AFD00E70590 /* PBXTargetDependency */,
-                       );
-                       name = CKKSCloudKitTests_ios;
-                       productName = CKKSTests;
-                       productReference = 6C98089D1E788AFD00E70590 /* CKKSCloudKitTests.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
+                       );
+                       name = stashtester;
+                       productName = stashtester;
+                       productReference = 6C963281242A279B00C53CE2 /* stashtester */;
+                       productType = "com.apple.product-type.tool";

                };
                6C9AA79D1F7C1D8F00D08296 /* supdctl */ = {
                        isa = PBXNativeTarget;
                };
                6C9AA79D1F7C1D8F00D08296 /* supdctl */ = {
                        isa = PBXNativeTarget;


@@ -24694,10 +28929,12 @@
                                6CAA8D1D1F842FB3007B6E03 /* Frameworks */,
                                6CAA8D1E1F842FB3007B6E03 /* Copy Manpage */,
                                6CAA8D361F84317F007B6E03 /* Install launchd plist */,
                                6CAA8D1D1F842FB3007B6E03 /* Frameworks */,
                                6CAA8D1E1F842FB3007B6E03 /* Copy Manpage */,
                                6CAA8D361F84317F007B6E03 /* Install launchd plist */,

+                               D42D044424734050004E7AA2 /* Install sandbox profile for macOS */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

+                               D456A06D22AF3238001119F3 /* PBXTargetDependency */,

                        );
                        name = securityuploadd;
                        productName = supd;
                        );
                        name = securityuploadd;
                        productName = supd;


@@ -24710,8 +28947,6 @@
                        buildPhases = (
                                6CCDF7801E3C25FA003F2555 /* Sources */,
                                6CCDF7811E3C25FA003F2555 /* Frameworks */,
                        buildPhases = (
                                6CCDF7801E3C25FA003F2555 /* Sources */,
                                6CCDF7811E3C25FA003F2555 /* Frameworks */,

-                               6CCDF7821E3C25FA003F2555 /* Copy BATS Test Discovery plist */,
-                               6CB5F4761E402D0000DBF3F0 /* ShellScript */,

                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );


@@ -24722,9 +28957,9 @@
                        productReference = 6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = 6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */;
                        productType = "com.apple.product-type.tool";
                };

-               6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */ = {
+               6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = 6CF4A0CC1E45488B00ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp_mac" */;
+                       buildConfigurationList = 6CF4A0CC1E45488B00ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp" */;

                        buildPhases = (
                                6CF4A0B01E45488B00ECD7B5 /* Sources */,
                                6CF4A0B11E45488B00ECD7B5 /* Frameworks */,
                        buildPhases = (
                                6CF4A0B01E45488B00ECD7B5 /* Sources */,
                                6CF4A0B11E45488B00ECD7B5 /* Frameworks */,


@@ -24734,40 +28969,25 @@
                        );
                        dependencies = (
                        );
                        );
                        dependencies = (
                        );

-                       name = KeychainEntitledTestApp_mac;
+                       name = KeychainEntitledTestApp;

                        productName = KeychainEntitledTestApp_mac;
                        productReference = 6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */;
                        productType = "com.apple.product-type.application";
                };
                        productName = KeychainEntitledTestApp_mac;
                        productReference = 6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */;
                        productType = "com.apple.product-type.application";
                };

-               6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 6CF4A0F41E4549F300ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp_ios" */;
-                       buildPhases = (
-                               6CF4A0DC1E4549F200ECD7B5 /* Sources */,
-                               6CF4A0DD1E4549F200ECD7B5 /* Frameworks */,
-                               6CF4A0DE1E4549F200ECD7B5 /* Resources */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = KeychainEntitledTestApp_ios;
-                       productName = KeychainEntitledTestApp_ios;
-                       productReference = 6CF4A0E01E4549F200ECD7B5 /* KeychainEntitledTestApp.app */;
-                       productType = "com.apple.product-type.application";
-               };

                790851B50CA9859F0083CC4D /* securityd_ios */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */;
                        buildPhases = (
                                790851B30CA9859F0083CC4D /* Sources */,
                                790851B40CA9859F0083CC4D /* Frameworks */,
                790851B50CA9859F0083CC4D /* securityd_ios */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */;
                        buildPhases = (
                                790851B30CA9859F0083CC4D /* Sources */,
                                790851B40CA9859F0083CC4D /* Frameworks */,

-                               79863B6C0CADCE4300818B0D /* CopyFiles */,
-                               4814D8691CAA059E002FFC36 /* CopyFiles */,
+                               79863B6C0CADCE4300818B0D /* launchd plist */,
+                               4814D8691CAA059E002FFC36 /* Copy Logging Files */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

+                               DCDA5E5E2124BA79009B11B2 /* PBXTargetDependency */,
+                               DC7FC45221EE9208003C39B8 /* PBXTargetDependency */,

                                DC65E7291D8CB2F400152EF0 /* PBXTargetDependency */,
                                D40B6A7F1E2B5F3D00CD6EE5 /* PBXTargetDependency */,
                                DC52E84B1D80BF1100B0A59C /* PBXTargetDependency */,
                                DC65E7291D8CB2F400152EF0 /* PBXTargetDependency */,
                                D40B6A7F1E2B5F3D00CD6EE5 /* PBXTargetDependency */,
                                DC52E84B1D80BF1100B0A59C /* PBXTargetDependency */,


@@ -24790,6 +29010,9 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9D52224FE4100A802E0 /* PBXTargetDependency */,
+                               D4E0E9D12224FE3300A802E0 /* PBXTargetDependency */,
+                               D4E0E9D32224FE3300A802E0 /* PBXTargetDependency */,

                                DC65E7701D8CB4ED00152EF0 /* PBXTargetDependency */,
                        );
                        name = sslServer;
                                DC65E7701D8CB4ED00152EF0 /* PBXTargetDependency */,
                        );
                        name = sslServer;


@@ -24825,6 +29048,8 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9CF2224FD7A00A802E0 /* PBXTargetDependency */,
+                               D4E0E9C52224E71600A802E0 /* PBXTargetDependency */,

                        );
                        name = SharedWebCredentialViewService;
                        productName = KeychainViewService;
                        );
                        name = SharedWebCredentialViewService;
                        productName = KeychainViewService;


@@ -24849,6 +29074,43 @@
                        productReference = BE442BC118B7FDB800F24DAE /* swcagent */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = BE442BC118B7FDB800F24DAE /* swcagent */;
                        productType = "com.apple.product-type.tool";
                };

+               BEAA002A202A832500E51F45 /* TrustedPeersHelper */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = BEAA003E202A832500E51F45 /* Build configuration list for PBXNativeTarget "TrustedPeersHelper" */;
+                       buildPhases = (
+                               BEAA0027202A832500E51F45 /* Sources */,
+                               BEAA0029202A832500E51F45 /* Resources */,
+                               BEAA0028202A832500E51F45 /* Frameworks */,
+                               EB3FB9A3231C125400DF52EA /* Copy Logging Files */,
+                               DC2C884D245B4B3E0040CBEB /* Copy Sandbox Profile (macOS only) */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               BED01526206EEC710027A2B4 /* PBXTargetDependency */,
+                       );
+                       name = TrustedPeersHelper;
+                       productName = TrustedPeersHelper;
+                       productReference = BEAA002B202A832500E51F45 /* TrustedPeersHelper.xpc */;
+                       productType = "com.apple.product-type.xpc-service";
+               };
+               BECFA42D20F91AFE00B11002 /* tppolicy */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = BECFA43920F91AFE00B11002 /* Build configuration list for PBXNativeTarget "tppolicy" */;
+                       buildPhases = (
+                               BECFA42A20F91AFE00B11002 /* Sources */,
+                               BECFA42B20F91AFE00B11002 /* Frameworks */,
+                               BECFA42C20F91AFE00B11002 /* CopyFiles */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = tppolicy;
+                       productName = tppolicy;
+                       productReference = BECFA42E20F91AFE00B11002 /* tppolicy */;
+                       productType = "com.apple.product-type.tool";
+               };

                BED208D41EDF950E00753952 /* manifeststresstest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BED208DA1EDF950E00753952 /* Build configuration list for PBXNativeTarget "manifeststresstest" */;
                BED208D41EDF950E00753952 /* manifeststresstest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BED208DA1EDF950E00753952 /* Build configuration list for PBXNativeTarget "manifeststresstest" */;


@@ -24865,6 +29127,30 @@
                        productReference = BED208DD1EDF950E00753952 /* manifeststresstest */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = BED208DD1EDF950E00753952 /* manifeststresstest */;
                        productType = "com.apple.product-type.tool";
                };

+               BED987D22099145300607A5F /* TrustedPeersHelperUnitTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = BED987DB2099145400607A5F /* Build configuration list for PBXNativeTarget "TrustedPeersHelperUnitTests" */;
+                       buildPhases = (
+                               BED987CF2099145300607A5F /* Sources */,
+                               BED987D02099145300607A5F /* Frameworks */,
+                               BED987D12099145300607A5F /* Resources */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               DC69A5832165295F00512BD6 /* PBXTargetDependency */,
+                               DC6013372147222B00863C1A /* PBXTargetDependency */,
+                               DC00C92720B3B86800628BEB /* PBXTargetDependency */,
+                               DC00C91F20B3B7A800628BEB /* PBXTargetDependency */,
+                               DC00C91A20B3B74E00628BEB /* PBXTargetDependency */,
+                               DC00C91820B3B74600628BEB /* PBXTargetDependency */,
+                               DC00C91620B3B73900628BEB /* PBXTargetDependency */,
+                       );
+                       name = TrustedPeersHelperUnitTests;
+                       productName = TrustedPeersHelperUnitTests;
+                       productReference = BED987D32099145300607A5F /* TrustedPeersHelperUnitTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                BEF88C271EAFFC3F00357577 /* TrustedPeers */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BEF88C421EAFFC4000357577 /* Build configuration list for PBXNativeTarget "TrustedPeers" */;
                BEF88C271EAFFC3F00357577 /* TrustedPeers */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BEF88C421EAFFC4000357577 /* Build configuration list for PBXNativeTarget "TrustedPeers" */;


@@ -24877,6 +29163,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D437C33121EBF8A000DD1E06 /* PBXTargetDependency */,

                        );
                        name = TrustedPeers;
                        productName = TrustedPeers;
                        );
                        name = TrustedPeers;
                        productName = TrustedPeers;


@@ -24894,7 +29181,6 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

-                               BEF88C331EAFFC3F00357577 /* PBXTargetDependency */,

                        );
                        name = TrustedPeersTests;
                        productName = TrustedPeersTests;
                        );
                        name = TrustedPeersTests;
                        productName = TrustedPeersTests;


@@ -24921,6 +29207,117 @@
                        productReference = D41257CF1E9410A300781F23 /* trustd */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = D41257CF1E9410A300781F23 /* trustd */;
                        productType = "com.apple.product-type.tool";
                };

+               D42C839721159146008D3D83 /* security_cms */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D42C839921159147008D3D83 /* Build configuration list for PBXNativeTarget "security_cms" */;
+                       buildPhases = (
+                               D42C839421159146008D3D83 /* Headers */,
+                               D42C839521159146008D3D83 /* Sources */,
+                               D42C839621159146008D3D83 /* Frameworks */,
+                               D43718C021168BD400EA350A /* Copy Open Source Version */,
+                               D43718C221168C5500EA350A /* Copy Open Source Licenses */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = security_cms;
+                       productName = security_cms;
+                       productReference = D42C839821159146008D3D83 /* libsecurity_cms.a */;
+                       productType = "com.apple.product-type.library.static";
+               };
+               D44D1F652115893000E76E1A /* CMS */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D44D1F6E2115893000E76E1A /* Build configuration list for PBXNativeTarget "CMS" */;
+                       buildPhases = (
+                               D44D1F622115893000E76E1A /* Headers */,
+                               D44D1F632115893000E76E1A /* Sources */,
+                               D44D1F642115893000E76E1A /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = CMS;
+                       productName = CMS;
+                       productReference = D44D1F662115893000E76E1A /* libCMS.a */;
+                       productType = "com.apple.product-type.library.static";
+               };
+               D453A4A42122236D00850A26 /* TrustTests_macos */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D453A4BD2122236D00850A26 /* Build configuration list for PBXNativeTarget "TrustTests_macos" */;
+                       buildPhases = (
+                               D453A4A72122236D00850A26 /* Sources */,
+                               D453A4B12122236D00850A26 /* Frameworks */,
+                               D453A4BB2122236D00850A26 /* Resources */,
+                               D4428B46212271E400EB8448 /* Generate BATS Plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               D4794E6B21222E72007C6725 /* PBXTargetDependency */,
+                               D453A4A52122236D00850A26 /* PBXTargetDependency */,
+                               D453A4C42122262400850A26 /* PBXTargetDependency */,
+                       );
+                       name = TrustTests_macos;
+                       productName = TrustTests;
+                       productReference = D453A4C02122236D00850A26 /* TrustTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };
+               D458C4E0214E1DE00043D982 /* TrustTestsRunner_ios */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D458C4F4214E1DE10043D982 /* Build configuration list for PBXNativeTarget "TrustTestsRunner_ios" */;
+                       buildPhases = (
+                               D458C4DD214E1DE00043D982 /* Sources */,
+                               D458C4DE214E1DE00043D982 /* Frameworks */,
+                               D458C4DF214E1DE00043D982 /* Resources */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = TrustTestsRunner_ios;
+                       productName = TrustTestsRunner_ios;
+                       productReference = D458C4E1214E1DE00043D982 /* TrustTestsRunner_ios.app */;
+                       productType = "com.apple.product-type.application";
+               };
+               D458C505214E20530043D982 /* TrustTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D458C50D214E20540043D982 /* Build configuration list for PBXNativeTarget "TrustTests" */;
+                       buildPhases = (
+                               D458C502214E20530043D982 /* Sources */,
+                               D458C503214E20530043D982 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = TrustTests;
+                       productName = TrustTests;
+                       productReference = D458C506214E20530043D982 /* TrustTests */;
+                       productType = "com.apple.product-type.tool";
+               };
+               D4707A0421136E69005BCFDA /* TrustTests_ios */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D4707A0A21136E6A005BCFDA /* Build configuration list for PBXNativeTarget "TrustTests_ios" */;
+                       buildPhases = (
+                               D4707A0121136E69005BCFDA /* Sources */,
+                               D4707A0221136E69005BCFDA /* Frameworks */,
+                               D4707A0321136E69005BCFDA /* Resources */,
+                               D4428B432122718400EB8448 /* Generate BATS Plist */,
+                               D428337D24E1D0B10068B2F5 /* Remove Name Constraints Resources from watchOS */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               D453A4C8212226A900850A26 /* PBXTargetDependency */,
+                               D4B68C6A211B6E3E009FED69 /* PBXTargetDependency */,
+                       );
+                       name = TrustTests_ios;
+                       productName = TrustTests;
+                       productReference = D4707A0521136E69005BCFDA /* TrustTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                D4ADA3181E2B41670031CEA3 /* libtrustd */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = D4ADA31A1E2B41670031CEA3 /* Build configuration list for PBXNativeTarget "libtrustd" */;
                D4ADA3181E2B41670031CEA3 /* libtrustd */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = D4ADA31A1E2B41670031CEA3 /* Build configuration list for PBXNativeTarget "libtrustd" */;


@@ -24938,6 +29335,23 @@
                        productReference = D4ADA3191E2B41670031CEA3 /* libtrustd.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = D4ADA3191E2B41670031CEA3 /* libtrustd.a */;
                        productType = "com.apple.product-type.library.static";
                };

+               D4D1FDDB21165F8B003538E2 /* security_cms_regressions */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = D4D1FDDD21165F8B003538E2 /* Build configuration list for PBXNativeTarget "security_cms_regressions" */;
+                       buildPhases = (
+                               D4D1FDD821165F8B003538E2 /* Headers */,
+                               D4D1FDD921165F8B003538E2 /* Sources */,
+                               D4D1FDDA21165F8B003538E2 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = security_cms_regressions;
+                       productName = security_cms_regressions;
+                       productReference = D4D1FDDC21165F8B003538E2 /* libsecurity_cms_regressions.a */;
+                       productType = "com.apple.product-type.library.static";
+               };

                DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DA30D6801DF8C8FB00EC6B43 /* Build configuration list for PBXNativeTarget "KeychainSyncAccountUpdater" */;
                DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DA30D6801DF8C8FB00EC6B43 /* Build configuration list for PBXNativeTarget "KeychainSyncAccountUpdater" */;


@@ -24955,6 +29369,24 @@
                        productReference = DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */;
                        productType = "com.apple.product-type.bundle";
                };
                        productReference = DA30D6761DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater.bundle */;
                        productType = "com.apple.product-type.bundle";
                };

+               DA41FE0D2241ADC000838FB3 /* otpaird */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DA41FE152241ADC000838FB3 /* Build configuration list for PBXNativeTarget "otpaird" */;
+                       buildPhases = (
+                               DA41FE0A2241ADC000838FB3 /* Sources */,
+                               DA41FE0B2241ADC000838FB3 /* Frameworks */,
+                               DA41FE162241AE9100838FB3 /* Install launchd plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               0CC593F82299EDFC006C34B5 /* PBXTargetDependency */,
+                       );
+                       name = otpaird;
+                       productName = otpaird;
+                       productReference = DA41FE0E2241ADC000838FB3 /* otpaird */;
+                       productType = "com.apple.product-type.tool";
+               };

                DAE40BC520CF3E46002D5674 /* secitemcanarytest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DAE40BCB20CF3E46002D5674 /* Build configuration list for PBXNativeTarget "secitemcanarytest" */;
                DAE40BC520CF3E46002D5674 /* secitemcanarytest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DAE40BCB20CF3E46002D5674 /* Build configuration list for PBXNativeTarget "secitemcanarytest" */;


@@ -25007,6 +29439,25 @@
                        productReference = DC0067D01D878898005AF8DB /* libsecurityd_ucspc.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DC0067D01D878898005AF8DB /* libsecurityd_ucspc.a */;
                        productType = "com.apple.product-type.library.static";
                };

+               DC05037521409A4000A8EDB7 /* OCMockUmbrella */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DC05037F21409A4100A8EDB7 /* Build configuration list for PBXNativeTarget "OCMockUmbrella" */;
+                       buildPhases = (
+                               DC05037121409A4000A8EDB7 /* Headers */,
+                               DC05037221409A4000A8EDB7 /* Sources */,
+                               DC05037321409A4000A8EDB7 /* Frameworks */,
+                               DC05037421409A4000A8EDB7 /* Resources */,
+                               DC05038021409A4F00A8EDB7 /* Embed OCMock */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = OCMockUmbrella;
+                       productName = OCMockUmbrella;
+                       productReference = DC05037621409A4000A8EDB7 /* OCMockUmbrella.framework */;
+                       productType = "com.apple.product-type.framework";
+               };

                DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC0BC55D1D8B6D2E00070CB0 /* Build configuration list for PBXNativeTarget "XPCKeychainSandboxCheck" */;
                DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC0BC55D1D8B6D2E00070CB0 /* Build configuration list for PBXNativeTarget "XPCKeychainSandboxCheck" */;


@@ -25386,6 +29837,24 @@
                        productReference = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DC0BCD481D8C694700070CB0 /* libutilitiesRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };

+               DC0EF8EE208697C600AB9E95 /* tpctl */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DC0EF8F3208697C700AB9E95 /* Build configuration list for PBXNativeTarget "tpctl" */;
+                       buildPhases = (
+                               DC0EF8EB208697C600AB9E95 /* Sources */,
+                               DC0EF8EC208697C600AB9E95 /* Frameworks */,
+                               DC0EF8ED208697C600AB9E95 /* CopyFiles */,
+                               EBE2026A20908C5600B48020 /* install man8 page */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = tpctl;
+                       productName = tpctl;
+                       productReference = DC0EF8EF208697C600AB9E95 /* tpctl */;
+                       productType = "com.apple.product-type.tool";
+               };

                DC1789031D77980500B50D50 /* Security_osx */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */;
                DC1789031D77980500B50D50 /* Security_osx */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */;


@@ -25396,27 +29865,26 @@
                                DC1789001D77980500B50D50 /* Frameworks */,
                                DC1789A71D779E7E00B50D50 /* Run Script Generate Strings */,
                                DC1789021D77980500B50D50 /* Resources */,
                                DC1789001D77980500B50D50 /* Frameworks */,
                                DC1789A71D779E7E00B50D50 /* Run Script Generate Strings */,
                                DC1789021D77980500B50D50 /* Resources */,

-                               DC1789E81D77A0E700B50D50 /* CopyFiles */,

                                DC178B481D77A51600B50D50 /* Make XPC server symlink */,
                                DC178B481D77A51600B50D50 /* Make XPC server symlink */,

+                               F3384FD52165A071004A2171 /* Install Ariadne Signposts Plist */,

                        );
                        buildRules = (
                                DC58C36E1D77B4AD003C25A4 /* PBXBuildRule */,
                        );
                        dependencies = (
                        );
                        buildRules = (
                                DC58C36E1D77B4AD003C25A4 /* PBXBuildRule */,
                        );
                        dependencies = (

-                               DCD8A1FE1E09FA1800E4FA0A /* PBXTargetDependency */,
-                               DCC5BF381D937329008D1E84 /* PBXTargetDependency */,
-                               DC1789791D779C6700B50D50 /* PBXTargetDependency */,

                                DC0BCDB71D8C6AD100070CB0 /* PBXTargetDependency */,
                                DC0BCDB71D8C6AD100070CB0 /* PBXTargetDependency */,

+                               DCD06BCF1D8E0F01007602F1 /* PBXTargetDependency */,
+                               DCB342371D8A2CD70054D16E /* PBXTargetDependency */,
+                               DC0BC5AF1D8B714000070CB0 /* PBXTargetDependency */,

                                DCB340191D8A248C0054D16E /* PBXTargetDependency */,
                                DCB340191D8A248C0054D16E /* PBXTargetDependency */,

-                               DCD66DC31D82056C00DB1393 /* PBXTargetDependency */,

                                DCD66DE61D82061F00DB1393 /* PBXTargetDependency */,
                                DCD66DE61D82061F00DB1393 /* PBXTargetDependency */,

+                               DCD66DC31D82056C00DB1393 /* PBXTargetDependency */,

                                DC52EE7E1D80D8B100B0A59C /* PBXTargetDependency */,
                                DC52EE7E1D80D8B100B0A59C /* PBXTargetDependency */,

-                               DCD06A8A1D8CE356007602F1 /* PBXTargetDependency */,
-                               DCB342371D8A2CD70054D16E /* PBXTargetDependency */,
-                               DC0BC5AF1D8B714000070CB0 /* PBXTargetDependency */,
+                               D437185421166DD800EA350A /* PBXTargetDependency */,

                                DC0067901D878132005AF8DB /* PBXTargetDependency */,
                                DC0067C41D8787AE005AF8DB /* PBXTargetDependency */,
                                DC0067D31D8788C4005AF8DB /* PBXTargetDependency */,
                                DC0067901D878132005AF8DB /* PBXTargetDependency */,
                                DC0067C41D8787AE005AF8DB /* PBXTargetDependency */,
                                DC0067D31D8788C4005AF8DB /* PBXTargetDependency */,

+                               DCD06A8A1D8CE356007602F1 /* PBXTargetDependency */,

                                DC0BC9991D8B814A00070CB0 /* PBXTargetDependency */,
                                DC0BCB001D8B85E500070CB0 /* PBXTargetDependency */,
                                DC0BC9651D8B80D200070CB0 /* PBXTargetDependency */,
                                DC0BC9991D8B814A00070CB0 /* PBXTargetDependency */,
                                DC0BCB001D8B85E500070CB0 /* PBXTargetDependency */,
                                DC0BC9651D8B80D200070CB0 /* PBXTargetDependency */,


@@ -25427,7 +29895,6 @@
                                DC0BC9C71D8B820000070CB0 /* PBXTargetDependency */,
                                DC0BCB301D8B89AB00070CB0 /* PBXTargetDependency */,
                                DC0BC8F61D8B7DE700070CB0 /* PBXTargetDependency */,
                                DC0BC9C71D8B820000070CB0 /* PBXTargetDependency */,
                                DC0BCB301D8B89AB00070CB0 /* PBXTargetDependency */,
                                DC0BC8F61D8B7DE700070CB0 /* PBXTargetDependency */,

-                               DCD06BCF1D8E0F01007602F1 /* PBXTargetDependency */,

                                DCF785011D88B80600E694BB /* PBXTargetDependency */,
                                DCF788A91D88CC3500E694BB /* PBXTargetDependency */,
                                DCB345661D8A36060054D16E /* PBXTargetDependency */,
                                DCF785011D88B80600E694BB /* PBXTargetDependency */,
                                DCF788A91D88CC3500E694BB /* PBXTargetDependency */,
                                DCB345661D8A36060054D16E /* PBXTargetDependency */,


@@ -25440,6 +29907,7 @@
                                DCF789461D88CD7C00E694BB /* PBXTargetDependency */,
                                DCB341791D8A2AF10054D16E /* PBXTargetDependency */,
                                DC0BC7BF1D8B784F00070CB0 /* PBXTargetDependency */,
                                DCF789461D88CD7C00E694BB /* PBXTargetDependency */,
                                DCB341791D8A2AF10054D16E /* PBXTargetDependency */,
                                DC0BC7BF1D8B784F00070CB0 /* PBXTargetDependency */,

+                               DCD8A1FE1E09FA1800E4FA0A /* PBXTargetDependency */,

                                DC00AB6A1D821C0700513D74 /* PBXTargetDependency */,
                        );
                        name = Security_osx;
                                DC00AB6A1D821C0700513D74 /* PBXTargetDependency */,
                        );
                        name = Security_osx;


@@ -25447,22 +29915,21 @@
                        productReference = DC1789041D77980500B50D50 /* Security.framework */;
                        productType = "com.apple.product-type.framework";
                };
                        productReference = DC1789041D77980500B50D50 /* Security.framework */;
                        productType = "com.apple.product-type.framework";
                };

-               DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */ = {
+               DC311E6E2124B8A8002F5EAE /* aks_real_witness */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = DC222C741E034D1F00B09171 /* Build configuration list for PBXNativeTarget "libsecurityd_ios_NO_AKS" */;
+                       buildConfigurationList = DC311E742124B8A8002F5EAE /* Build configuration list for PBXNativeTarget "aks_real_witness" */;

                        buildPhases = (
                        buildPhases = (

-                               DC222C381E034D1F00B09171 /* Sources */,
-                               DC222C631E034D1F00B09171 /* Frameworks */,
-                               DC222C641E034D1F00B09171 /* Headers */,
+                               DC311E6F2124B8A8002F5EAE /* Headers */,
+                               DC311E712124B8A8002F5EAE /* Sources */,
+                               DC311E732124B8A8002F5EAE /* Frameworks */,

                        );
                        buildRules = (
                        );
                        buildRules = (

-                               DC9FD3221F85877000C8AAC8 /* PBXBuildRule */,

                        );
                        dependencies = (
                        );
                        );
                        dependencies = (
                        );

-                       name = libsecurityd_ios_NO_AKS;
-                       productName = libsecurity;
-                       productReference = DC222C771E034D1F00B09171 /* libsecurityd_ios_NO_AKS.a */;
+                       name = aks_real_witness;
+                       productName = mockaks;
+                       productReference = DC311E772124B8A8002F5EAE /* libaks_real_witness.a */;

                        productType = "com.apple.product-type.library.static";
                };
                DC3502B41E0208BE00BC0587 /* CKKSTests */ = {
                        productType = "com.apple.product-type.library.static";
                };
                DC3502B41E0208BE00BC0587 /* CKKSTests */ = {


@@ -25472,24 +29939,41 @@
                                DC3502B11E0208BE00BC0587 /* Sources */,
                                DC3502B21E0208BE00BC0587 /* Frameworks */,
                                DC9A2C791EB40A64008FAC27 /* Embed OCMock */,
                                DC3502B11E0208BE00BC0587 /* Sources */,
                                DC3502B21E0208BE00BC0587 /* Frameworks */,
                                DC9A2C791EB40A64008FAC27 /* Embed OCMock */,

-                               DC7162D41EB4154D000D2BB5 /* Copy BATS Test Discovery Plist */,

                                DC7162D61EB4157D000D2BB5 /* ShellScript */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                                DC7162D61EB4157D000D2BB5 /* ShellScript */,
                        );
                        buildRules = (
                        );
                        dependencies = (

+                               DCD6BF5821E919820015F7A8 /* PBXTargetDependency */,
+                               DC311E672124A9D2002F5EAE /* PBXTargetDependency */,

                                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */,
                                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */,
                                DC0984F71E1DB6D400140ADC /* PBXTargetDependency */,
                                DC0985001E1DB70A00140ADC /* PBXTargetDependency */,
                                DC3502D51E02117600BC0587 /* PBXTargetDependency */,
                                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */,
                                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */,
                                DC0984F71E1DB6D400140ADC /* PBXTargetDependency */,
                                DC0985001E1DB70A00140ADC /* PBXTargetDependency */,
                                DC3502D51E02117600BC0587 /* PBXTargetDependency */,

-                               DC222C791E034EE700B09171 /* PBXTargetDependency */,

                        );
                        name = CKKSTests;
                        productName = CKKSTests;
                        productReference = DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        );
                        name = CKKSTests;
                        productName = CKKSTests;
                        productReference = DC3502B51E0208BE00BC0587 /* CKKSTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

+               DC36895D21235F42003A3735 /* aks_mock */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DC36895F21235F42003A3735 /* Build configuration list for PBXNativeTarget "aks_mock" */;
+                       buildPhases = (
+                               DC36895A21235F42003A3735 /* Headers */,
+                               DC36895B21235F42003A3735 /* Sources */,
+                               DC36895C21235F42003A3735 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = aks_mock;
+                       productName = mockaks;
+                       productReference = DC36895E21235F42003A3735 /* libaks_mock.a */;
+                       productType = "com.apple.product-type.library.static";
+               };

                DC3A4B571D91E9FB00E46D4A /* CodeSigningHelper */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC3A4B5B1D91E9FB00E46D4A /* Build configuration list for PBXNativeTarget "CodeSigningHelper" */;
                DC3A4B571D91E9FB00E46D4A /* CodeSigningHelper */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC3A4B5B1D91E9FB00E46D4A /* Build configuration list for PBXNativeTarget "CodeSigningHelper" */;


@@ -25517,7 +30001,6 @@
                                DC52E7AE1D80BC8000B0A59C /* Headers */,
                        );
                        buildRules = (
                                DC52E7AE1D80BC8000B0A59C /* Headers */,
                        );
                        buildRules = (

-                               DC9FD3201F85818000C8AAC8 /* PBXBuildRule */,

                        );
                        dependencies = (
                        );
                        );
                        dependencies = (
                        );


@@ -25543,40 +30026,6 @@
                        productReference = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DC52E8C61D80C25800B0A59C /* libSecureObjectSyncServer.a */;
                        productType = "com.apple.product-type.library.static";
                };

-               DC52EA441D80CB7000B0A59C /* SecurityTool */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC52EA491D80CB7000B0A59C /* Build configuration list for PBXNativeTarget "SecurityTool" */;
-                       buildPhases = (
-                               DC52EA451D80CB7000B0A59C /* Sources */,
-                               DC52EA471D80CB7000B0A59C /* Frameworks */,
-                               DC52EA481D80CB7000B0A59C /* Headers */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = SecurityTool;
-                       productName = libsecurity;
-                       productReference = DC52EA4C1D80CB7000B0A59C /* libSecurityTool.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
-               DC52EBC61D80CEF100B0A59C /* SecurityCommands */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = DC52EBD21D80CEF100B0A59C /* Build configuration list for PBXNativeTarget "SecurityCommands" */;
-                       buildPhases = (
-                               DC52EBC71D80CEF100B0A59C /* Sources */,
-                               DC52EBCF1D80CEF100B0A59C /* Frameworks */,
-                               DC52EBD11D80CEF100B0A59C /* Headers */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = SecurityCommands;
-                       productName = libsecurity;
-                       productReference = DC52EBD51D80CEF100B0A59C /* libSecurityCommands.a */;
-                       productType = "com.apple.product-type.library.static";
-               };

                DC52EC211D80CFB200B0A59C /* SOSCommands */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC52EC311D80CFB200B0A59C /* Build configuration list for PBXNativeTarget "SOSCommands" */;
                DC52EC211D80CFB200B0A59C /* SOSCommands */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DC52EC311D80CFB200B0A59C /* Build configuration list for PBXNativeTarget "SOSCommands" */;


@@ -25744,7 +30193,6 @@
                        dependencies = (
                                DC65E7391D8CB38300152EF0 /* PBXTargetDependency */,
                                DC65E73B1D8CB39300152EF0 /* PBXTargetDependency */,
                        dependencies = (
                                DC65E7391D8CB38300152EF0 /* PBXTargetDependency */,
                                DC65E73B1D8CB39300152EF0 /* PBXTargetDependency */,

-                               DC58C42A1D77BE03003C25A4 /* PBXTargetDependency */,

                        );
                        name = csparser_osx;
                        productName = csparser;
                        );
                        name = csparser_osx;
                        productName = csparser;


@@ -25777,13 +30225,16 @@
                                DC5AC0D71D83548B00CF422C /* Headers */,
                                DC5AC04C1D8352D900CF422C /* Sources */,
                                DC5AC04D1D8352D900CF422C /* Frameworks */,
                                DC5AC0D71D83548B00CF422C /* Headers */,
                                DC5AC04C1D8352D900CF422C /* Sources */,
                                DC5AC04D1D8352D900CF422C /* Frameworks */,

-                               DC5AC04E1D8352D900CF422C /* CopyFiles */,
+                               DC5AC04E1D8352D900CF422C /* Man pages */,
+                               6C23F02E227A39FD009F6756 /* Install Sandbox Profile */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9CB2224FB5700A802E0 /* PBXTargetDependency */,

                                DC5AC0BF1D83534300CF422C /* PBXTargetDependency */,
                                DC5AC0BD1D83533E00CF422C /* PBXTargetDependency */,
                                DC5AC0BF1D83534300CF422C /* PBXTargetDependency */,
                                DC5AC0BD1D83533E00CF422C /* PBXTargetDependency */,

+                               DCF19A6E21AE2CDC002E808F /* PBXTargetDependency */,

                                DC6BC27B1D90D11C00DD57B3 /* PBXTargetDependency */,
                                DC008B5A1D90CEC7004002A3 /* PBXTargetDependency */,
                                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */,
                                DC6BC27B1D90D11C00DD57B3 /* PBXTargetDependency */,
                                DC008B5A1D90CEC7004002A3 /* PBXTargetDependency */,
                                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */,


@@ -25891,29 +30342,28 @@
                        productReference = DC6A82921D87749900418608 /* libsecurityd_client.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DC6A82921D87749900418608 /* libsecurityd_client.a */;
                        productType = "com.apple.product-type.library.static";
                };

-               DC71D99F1D95BA6C0065FB93 /* ASN1 */ = {
+               DC7FC44721EE914C003C39B8 /* FeatureFlagsPlist */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = DC71D9DC1D95BA6C0065FB93 /* Build configuration list for PBXNativeTarget "ASN1" */;
+                       buildConfigurationList = DC7FC44C21EE914D003C39B8 /* Build configuration list for PBXNativeTarget "FeatureFlagsPlist" */;

                        buildPhases = (
                        buildPhases = (

-                               DC71D9FE1D95BB5B0065FB93 /* Why is this here? */,
-                               DC71D9A01D95BA6C0065FB93 /* Headers */,
-                               DC71D9C31D95BA6C0065FB93 /* Sources */,
-                               DC71D9DB1D95BA6C0065FB93 /* Frameworks */,
+                               DC7FC44421EE914C003C39B8 /* Sources */,
+                               DC7FC44521EE914C003C39B8 /* Frameworks */,
+                               DC7FC44621EE914C003C39B8 /* Resources */,
+                               DC7FC44F21EE9175003C39B8 /* Install Security FeatureFlags plist */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );

-                       name = ASN1;
-                       productName = libsecurityd_client_macos;
-                       productReference = DC71D9DF1D95BA6C0065FB93 /* libASN1.a */;
-                       productType = "com.apple.product-type.library.static";
+                       name = FeatureFlagsPlist;
+                       productName = FeatureFlagsPlist;
+                       productReference = DC7FC44821EE914C003C39B8 /* FeatureFlagsPlist.bundle */;
+                       productType = "com.apple.product-type.bundle";

                };
                };

-               DC8834011D8A218F00CE0ACA /* ASN1_not_installed */ = {
+               DC8834011D8A218F00CE0ACA /* ASN1 */ = {

                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;

-                       buildConfigurationList = DC8834051D8A218F00CE0ACA /* Build configuration list for PBXNativeTarget "ASN1_not_installed" */;
+                       buildConfigurationList = DC8834051D8A218F00CE0ACA /* Build configuration list for PBXNativeTarget "ASN1" */;

                        buildPhases = (
                        buildPhases = (

-                               DC71D9FF1D95BCDF0065FB93 /* Why is this here? */,

                                DC8834021D8A218F00CE0ACA /* Headers */,
                                DC8834031D8A218F00CE0ACA /* Sources */,
                                DC8834041D8A218F00CE0ACA /* Frameworks */,
                                DC8834021D8A218F00CE0ACA /* Headers */,
                                DC8834031D8A218F00CE0ACA /* Sources */,
                                DC8834041D8A218F00CE0ACA /* Frameworks */,


@@ -25922,11 +30372,34 @@
                        );
                        dependencies = (
                        );
                        );
                        dependencies = (
                        );

-                       name = ASN1_not_installed;
+                       name = ASN1;

                        productName = libsecurityd_client_macos;
                        productName = libsecurityd_client_macos;

-                       productReference = DC8834081D8A218F00CE0ACA /* libASN1_not_installed.a */;
+                       productReference = DC8834081D8A218F00CE0ACA /* libASN1.a */;

                        productType = "com.apple.product-type.library.static";
                };
                        productType = "com.apple.product-type.library.static";
                };

+               DC99B85B20EACA470065B73B /* OctagonTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DC99B88F20EACA470065B73B /* Build configuration list for PBXNativeTarget "OctagonTests" */;
+                       buildPhases = (
+                               DC99B86A20EACA470065B73B /* Sources */,
+                               DC99B87A20EACA470065B73B /* Frameworks */,
+                               DC99B88E20EACA470065B73B /* Resources */,
+                               DCEA0FF9213F1F410054A328 /* Generate BATS Plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               DC6063B021B0755D00069B82 /* PBXTargetDependency */,
+                               DC60133D214722C900863C1A /* PBXTargetDependency */,
+                               DC99B85C20EACA470065B73B /* PBXTargetDependency */,
+                               DC99B86220EACA470065B73B /* PBXTargetDependency */,
+                               DC99B86420EACA470065B73B /* PBXTargetDependency */,
+                       );
+                       name = OctagonTests;
+                       productName = TrustedPeersHelperUnitTests;
+                       productReference = DC99B89220EACA470065B73B /* OctagonTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                DCB340661D8A24DF0054D16E /* security_authorization */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCB3406A1D8A24DF0054D16E /* Build configuration list for PBXNativeTarget "security_authorization" */;
                DCB340661D8A24DF0054D16E /* security_authorization */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCB3406A1D8A24DF0054D16E /* Build configuration list for PBXNativeTarget "security_authorization" */;


@@ -26030,6 +30503,29 @@
                        productReference = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DCB3443E1D8A34FD0054D16E /* libsecurity_keychain_regressions.a */;
                        productType = "com.apple.product-type.library.static";
                };

+               DCBF4A8A21FFC82100539F0A /* SecEscrowRequestTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DCBF4ADD21FFC82100539F0A /* Build configuration list for PBXNativeTarget "SecEscrowRequestTests" */;
+                       buildPhases = (
+                               DCBF4A9921FFC82100539F0A /* Sources */,
+                               DCBF4AC021FFC82100539F0A /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               DCBF4A8B21FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A8D21FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A8F21FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A9121FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A9321FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A9521FFC82100539F0A /* PBXTargetDependency */,
+                               DCBF4A9721FFC82100539F0A /* PBXTargetDependency */,
+                       );
+                       name = SecEscrowRequestTests;
+                       productName = CKKSTests;
+                       productReference = DCBF4AE021FFC82100539F0A /* SecEscrowRequestTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                DCC78EA81D8088E200865A7C /* security */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCC78EAF1D8088E200865A7C /* Build configuration list for PBXNativeTarget "security" */;
                DCC78EA81D8088E200865A7C /* security */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCC78EAF1D8088E200865A7C /* Build configuration list for PBXNativeTarget "security" */;


@@ -26205,13 +30701,12 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               DCDA5E642124BCA9009B11B2 /* PBXTargetDependency */,

                                DC71D8EB1D959C130065FB93 /* PBXTargetDependency */,
                                DC71D8E41D959C000065FB93 /* PBXTargetDependency */,
                                DC00AB921D821D6000513D74 /* PBXTargetDependency */,
                                DC71DA0D1D95DD670065FB93 /* PBXTargetDependency */,
                                DCD8A2031E09FAE500E4FA0A /* PBXTargetDependency */,
                                DC71D8EB1D959C130065FB93 /* PBXTargetDependency */,
                                DC71D8E41D959C000065FB93 /* PBXTargetDependency */,
                                DC00AB921D821D6000513D74 /* PBXTargetDependency */,
                                DC71DA0D1D95DD670065FB93 /* PBXTargetDependency */,
                                DCD8A2031E09FAE500E4FA0A /* PBXTargetDependency */,

-                               DC00AB941D821D6500513D74 /* PBXTargetDependency */,
-                               DC00AB961D821D6800513D74 /* PBXTargetDependency */,

                        );
                        name = security2tool_macos;
                        productName = security;
                        );
                        name = security2tool_macos;
                        productName = security;


@@ -26237,8 +30732,7 @@
                                DC2671101F3E933700816EED /* PBXTargetDependency */,
                                DC52EE631D80D7D900B0A59C /* PBXTargetDependency */,
                                DCB345B31D8A361F0054D16E /* PBXTargetDependency */,
                                DC2671101F3E933700816EED /* PBXTargetDependency */,
                                DC52EE631D80D7D900B0A59C /* PBXTargetDependency */,
                                DCB345B31D8A361F0054D16E /* PBXTargetDependency */,

-                               DC63CAFA1D91A16700C03317 /* PBXTargetDependency */,
-                               DCE4E7BC1D7A45ED00AFB96E /* PBXTargetDependency */,
+                               D437185B211670F600EA350A /* PBXTargetDependency */,

                                ACBAF6FE1E941E090007BA2F /* PBXTargetDependency */,
                                DC0BCA781D8B830900070CB0 /* PBXTargetDependency */,
                                DC65E7521D8CB45300152EF0 /* PBXTargetDependency */,
                                ACBAF6FE1E941E090007BA2F /* PBXTargetDependency */,
                                DC0BCA781D8B830900070CB0 /* PBXTargetDependency */,
                                DC65E7521D8CB45300152EF0 /* PBXTargetDependency */,


@@ -26260,8 +30754,6 @@
                        dependencies = (
                                DC65E7661D8CB4C200152EF0 /* PBXTargetDependency */,
                                DC65E7681D8CB4CB00152EF0 /* PBXTargetDependency */,
                        dependencies = (
                                DC65E7661D8CB4C200152EF0 /* PBXTargetDependency */,
                                DC65E7681D8CB4CB00152EF0 /* PBXTargetDependency */,

-                               DCE4E7D81D7A4B3500AFB96E /* PBXTargetDependency */,
-                               DC193C6020CB4C9D009C1A0F /* PBXTargetDependency */,

                                DC65E76A1D8CB4D300152EF0 /* PBXTargetDependency */,
                        );
                        name = sectests_macos;
                                DC65E76A1D8CB4D300152EF0 /* PBXTargetDependency */,
                        );
                        name = sectests_macos;


@@ -26283,7 +30775,8 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

-                               DCD8A2071E09FB1F00E4FA0A /* PBXTargetDependency */,
+                               DCDA5E5C2124BA54009B11B2 /* PBXTargetDependency */,
+                               DC7FC45421EE921A003C39B8 /* PBXTargetDependency */,

                                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */,
                                DC00AB721D821C4600513D74 /* PBXTargetDependency */,
                                DC00AB741D821C4800513D74 /* PBXTargetDependency */,
                                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */,
                                DC00AB721D821C4600513D74 /* PBXTargetDependency */,
                                DC00AB741D821C4800513D74 /* PBXTargetDependency */,


@@ -26306,6 +30799,7 @@
                                DCE4E8541D7A57AE00AFB96E /* Copy LaunchDaemon Files */,
                                BEB463AD1E64F3C1008EB77E /* Copy Sandbox */,
                                D4ADA3111E2B209C0031CEA3 /* Install man8 page */,
                                DCE4E8541D7A57AE00AFB96E /* Copy LaunchDaemon Files */,
                                BEB463AD1E64F3C1008EB77E /* Copy Sandbox */,
                                D4ADA3111E2B209C0031CEA3 /* Install man8 page */,

+                               D459364124BFBA700066FB43 /* Install Apple Corporate Roots */,

                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );


@@ -26377,6 +30871,24 @@
                        productReference = DCE4E9111D7F3D5300AFB96E /* Keychain Circle Notification.app */;
                        productType = "com.apple.product-type.application";
                };
                        productReference = DCE4E9111D7F3D5300AFB96E /* Keychain Circle Notification.app */;
                        productType = "com.apple.product-type.application";
                };

+               DCF216D621ADD5B10029CCC1 /* protobuf_source_generation */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = DCF216DC21ADD5B10029CCC1 /* Build configuration list for PBXNativeTarget "protobuf_source_generation" */;
+                       buildPhases = (
+                               DCF216D321ADD5B10029CCC1 /* Headers */,
+                               DCF216D421ADD5B10029CCC1 /* Sources */,
+                               DCF216D521ADD5B10029CCC1 /* Frameworks */,
+                       );
+                       buildRules = (
+                               DCF216DD21ADD5D10029CCC1 /* PBXBuildRule */,
+                       );
+                       dependencies = (
+                       );
+                       name = protobuf_source_generation;
+                       productName = protobuf_source_generation;
+                       productReference = DCF216D721ADD5B10029CCC1 /* libprotobuf_source_generation.a */;
+                       productType = "com.apple.product-type.library.static";
+               };

                DCF7830A1D88B4DE00E694BB /* security_apple_csp */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCF783111D88B4DE00E694BB /* Build configuration list for PBXNativeTarget "security_apple_csp" */;
                DCF7830A1D88B4DE00E694BB /* security_apple_csp */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = DCF783111D88B4DE00E694BB /* Build configuration list for PBXNativeTarget "security_apple_csp" */;


@@ -26499,6 +31011,61 @@
                        productReference = DCF788D61D88CD2400E694BB /* libsecurity_apple_x509_tp.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = DCF788D61D88CD2400E694BB /* libsecurity_apple_x509_tp.a */;
                        productType = "com.apple.product-type.library.static";
                };

+               E060D19B2124780E0025B833 /* OctagonTestHarness */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = E060D1D2212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarness" */;
+                       buildPhases = (
+                               E060D1972124780E0025B833 /* Headers */,
+                               E060D1982124780E0025B833 /* Sources */,
+                               E060D1992124780E0025B833 /* Frameworks */,
+                               E060D1D0212478120025B833 /* Embed Frameworks */,
+                               E060D1D1212478120025B833 /* Embed XPC Services */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               E060D1AB212478100025B833 /* PBXTargetDependency */,
+                               E060D1BA212478120025B833 /* PBXTargetDependency */,
+                       );
+                       name = OctagonTestHarness;
+                       productName = OctagonTestHarness;
+                       productReference = E060D19C2124780E0025B833 /* OctagonTestHarness.framework */;
+                       productType = "com.apple.product-type.framework";
+               };
+               E060D1A62124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = E060D1CA212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarnessXPCServiceProtocol" */;
+                       buildPhases = (
+                               E060D1A22124780F0025B833 /* Headers */,
+                               E060D1A32124780F0025B833 /* Sources */,
+                               E060D1A42124780F0025B833 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = OctagonTestHarnessXPCServiceProtocol;
+                       productName = OctagonTestHarnessXPCServiceProtocol;
+                       productReference = E060D1A72124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol.framework */;
+                       productType = "com.apple.product-type.framework";
+               };
+               E060D1B6212478110025B833 /* OctagonTestHarnessXPCService */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = E060D1CD212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarnessXPCService" */;
+                       buildPhases = (
+                               E060D1B3212478110025B833 /* Sources */,
+                               E060D1B4212478110025B833 /* Frameworks */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               E060D1BC212478120025B833 /* PBXTargetDependency */,
+                       );
+                       name = OctagonTestHarnessXPCService;
+                       productName = OctagonTestHarnessXPCService;
+                       productReference = E060D1B7212478110025B833 /* OctagonTestHarnessXPCService.xpc */;
+                       productType = "com.apple.product-type.xpc-service";
+               };

                E710C7411331946400F85568 /* SecurityTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = E710C75C1331946500F85568 /* Build configuration list for PBXNativeTarget "SecurityTests" */;
                E710C7411331946400F85568 /* SecurityTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = E710C75C1331946500F85568 /* Build configuration list for PBXNativeTarget "SecurityTests" */;


@@ -26514,6 +31081,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               D4E0E9C72224E76100A802E0 /* PBXTargetDependency */,

                                DC00ABBB1D821E9B00513D74 /* PBXTargetDependency */,
                                DC00ABBD1D821E9F00513D74 /* PBXTargetDependency */,
                                DCD8A1F51E09F91F00E4FA0A /* PBXTargetDependency */,
                                DC00ABBB1D821E9B00513D74 /* PBXTargetDependency */,
                                DC00ABBD1D821E9F00513D74 /* PBXTargetDependency */,
                                DCD8A1F51E09F91F00E4FA0A /* PBXTargetDependency */,


@@ -26583,9 +31151,7 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

-                               E7D847D11C6BE9720025BB44 /* PBXTargetDependency */,
-                               DC00AB9E1D821DBB00513D74 /* PBXTargetDependency */,
-                               DCD8A1F81E09F97300E4FA0A /* PBXTargetDependency */,
+                               DCDA5E622124BAD7009B11B2 /* PBXTargetDependency */,

                                DC65E7401D8CB3CD00152EF0 /* PBXTargetDependency */,
                                DC65E7421D8CB3D400152EF0 /* PBXTargetDependency */,
                        );
                                DC65E7401D8CB3CD00152EF0 /* PBXTargetDependency */,
                                DC65E7421D8CB3D400152EF0 /* PBXTargetDependency */,
                        );


@@ -26594,43 +31160,6 @@
                        productReference = E7D847CE1C6BE9720025BB44 /* KeychainCircleTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productReference = E7D847CE1C6BE9720025BB44 /* KeychainCircleTests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

-               EB056E3D1FE5E390000A771E /* DeviceSimulator */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = EB056E4E1FE5E391000A771E /* Build configuration list for PBXNativeTarget "DeviceSimulator" */;
-                       buildPhases = (
-                               EBCE16631FE7366D002E7CCC /* Headers */,
-                               EB056E3A1FE5E390000A771E /* Sources */,
-                               EB056E3B1FE5E390000A771E /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = DeviceSimulator;
-                       productName = DeviceSimulator;
-                       productReference = EB056E3E1FE5E390000A771E /* DeviceSimulator.xpc */;
-                       productType = "com.apple.product-type.xpc-service";
-               };
-               EB05C4F01FE5E48A00D68712 /* MultiDeviceSimulatorTests */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = EB05C4FD1FE5E48B00D68712 /* Build configuration list for PBXNativeTarget "MultiDeviceSimulatorTests" */;
-                       buildPhases = (
-                               EBCE16651FE7368C002E7CCC /* Headers */,
-                               EB05C4ED1FE5E48A00D68712 /* Sources */,
-                               EB05C4EE1FE5E48A00D68712 /* Frameworks */,
-                               EB05C4EF1FE5E48A00D68712 /* Resources */,
-                               EBCE150D1FE63880002E7CCC /* Embedded XPC service */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               EBCE15101FE638A2002E7CCC /* PBXTargetDependency */,
-                       );
-                       name = MultiDeviceSimulatorTests;
-                       productName = MultiDeviceSimulatorTests;
-                       productReference = EB05C4F11FE5E48A00D68712 /* MultiDeviceSimulatorTests.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
-               };

                EB0BC9361C3C791500785842 /* secedumodetest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EB0BC93B1C3C791500785842 /* Build configuration list for PBXNativeTarget "secedumodetest" */;
                EB0BC9361C3C791500785842 /* secedumodetest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EB0BC93B1C3C791500785842 /* Build configuration list for PBXNativeTarget "secedumodetest" */;


@@ -26671,14 +31200,10 @@
                                EB108F251E6CE4D2003B0456 /* Sources */,
                                EB108F2B1E6CE4D2003B0456 /* Frameworks */,
                                EB108F3A1E6CE4D2003B0456 /* Resources */,
                                EB108F251E6CE4D2003B0456 /* Sources */,
                                EB108F2B1E6CE4D2003B0456 /* Frameworks */,
                                EB108F3A1E6CE4D2003B0456 /* Resources */,

-                               EB108F3D1E6CE4D2003B0456 /* chmod BATS Tests */,

                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (

-                               EBFBC2B21E76585500A34469 /* PBXTargetDependency */,
-                               EBFBC2B41E76586700A34469 /* PBXTargetDependency */,
-                               EBFBC2B61E76587800A34469 /* PBXTargetDependency */,

                                EB108F1F1E6CE4D2003B0456 /* PBXTargetDependency */,
                                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */,
                        );
                                EB108F1F1E6CE4D2003B0456 /* PBXTargetDependency */,
                                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */,
                        );


@@ -26764,12 +31289,80 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (

+                               DCD6BF5E21E919E10015F7A8 /* PBXTargetDependency */,
+                               DCC7A688216446EB0034967D /* PBXTargetDependency */,
+                               DCC7A686216446E50034967D /* PBXTargetDependency */,
+                               DCC7A684216446D90034967D /* PBXTargetDependency */,
+                               DCC7A682216446D30034967D /* PBXTargetDependency */,
+                               DCC7A67F216435B30034967D /* PBXTargetDependency */,
+                               DCC7A67B216435A40034967D /* PBXTargetDependency */,

                        );
                        name = secdmockaks;
                        productName = secdmockaks;
                        productReference = EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        );
                        name = secdmockaks;
                        productName = secdmockaks;
                        productReference = EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };

+               EB69527E223B75C300F02C1C /* secitemd */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = EB6952B6223B75C300F02C1C /* Build configuration list for PBXNativeTarget "secitemd" */;
+                       buildPhases = (
+                               EB695289223B75C300F02C1C /* Headers */,
+                               EB69528D223B75C300F02C1C /* Sources */,
+                               EB6952AA223B75C300F02C1C /* Frameworks */,
+                               EB6952B4223B75C300F02C1C /* launchd plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               EB69527F223B75C300F02C1C /* PBXTargetDependency */,
+                               EB695283223B75C300F02C1C /* PBXTargetDependency */,
+                               EB695285223B75C300F02C1C /* PBXTargetDependency */,
+                               EB695287223B75C300F02C1C /* PBXTargetDependency */,
+                       );
+                       name = secitemd;
+                       productName = securityd;
+                       productReference = EB6952B9223B75C300F02C1C /* secitemd */;
+                       productType = "com.apple.product-type.tool";
+               };
+               EB74CC152207E48000F1BBAD /* KeychainSettings */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = EB74CC1A2207E48100F1BBAD /* Build configuration list for PBXNativeTarget "KeychainSettings" */;
+                       buildPhases = (
+                               EB74CC122207E48000F1BBAD /* Sources */,
+                               EB74CC132207E48000F1BBAD /* Frameworks */,
+                               EB74CC142207E48000F1BBAD /* Resources */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = KeychainSettings;
+                       productName = KeychainSettings;
+                       productReference = EB74CC162207E48000F1BBAD /* KeychainSettings.bundle */;
+                       productType = "com.apple.product-type.bundle";
+               };
+               EB89085621F17D3C00F0DDDB /* recovery_securityd */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = EB89088321F17D3C00F0DDDB /* Build configuration list for PBXNativeTarget "recovery_securityd" */;
+                       buildPhases = (
+                               EB8908A421F186FE00F0DDDB /* Headers */,
+                               EB89086721F17D3C00F0DDDB /* Sources */,
+                               EB89086F21F17D3C00F0DDDB /* Frameworks */,
+                               EB89087F21F17D3C00F0DDDB /* launchd plist */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                               EB89085721F17D3C00F0DDDB /* PBXTargetDependency */,
+                               EB89085B21F17D3C00F0DDDB /* PBXTargetDependency */,
+                               EB89085D21F17D3C00F0DDDB /* PBXTargetDependency */,
+                               EB89086521F17D3C00F0DDDB /* PBXTargetDependency */,
+                       );
+                       name = recovery_securityd;
+                       productName = securityd;
+                       productReference = EB89088621F17D3C00F0DDDB /* recovery_securityd */;
+                       productType = "com.apple.product-type.tool";
+               };

                EB9C1D791BDFD0E000F89272 /* secbackupntest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EB9C1DA91BDFD0E100F89272 /* Build configuration list for PBXNativeTarget "secbackupntest" */;
                EB9C1D791BDFD0E000F89272 /* secbackupntest */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EB9C1DA91BDFD0E100F89272 /* Build configuration list for PBXNativeTarget "secbackupntest" */;


@@ -26819,6 +31412,23 @@
                        productReference = EBB839A51E29665D00853BAC /* secfuzzer */;
                        productType = "com.apple.product-type.tool";
                };
                        productReference = EBB839A51E29665D00853BAC /* secfuzzer */;
                        productType = "com.apple.product-type.tool";
                };

+               EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = EBB8520822F7912500424FD0 /* Build configuration list for PBXNativeTarget "SecurityUtilitiesTests" */;
+                       buildPhases = (
+                               EBB851E822F7912400424FD0 /* Sources */,
+                               EBB851E922F7912400424FD0 /* Frameworks */,
+                               EB0F4A2B22F7D3BD009E855B /* Embedd OCMock */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = SecurityUtilitiesTests;
+                       productName = SecurityUtilitiesTests;
+                       productReference = EBB851EC22F7912400424FD0 /* SecurityUtilitiesTests.xctest */;
+                       productType = "com.apple.product-type.bundle.unit-test";
+               };

                EBCF73F31CE45F9C00BED7CA /* secitemfunctionality */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EBCF73F91CE45F9C00BED7CA /* Build configuration list for PBXNativeTarget "secitemfunctionality" */;
                EBCF73F31CE45F9C00BED7CA /* secitemfunctionality */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = EBCF73F91CE45F9C00BED7CA /* Build configuration list for PBXNativeTarget "secitemfunctionality" */;


@@ -26895,8 +31505,12 @@
                4C35DB69094F906D002917C4 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
                4C35DB69094F906D002917C4 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {

-                               LastUpgradeCheck = 1000;
+                               LastSwiftUpdateCheck = 1200;
+                               LastUpgradeCheck = 1200;

                                TargetAttributes = {
                                TargetAttributes = {

+                                       0CD743A523C3EC8000FA0EC5 = {
+                                               CreatedOnToolsVersion = 12.0;
+                                       };

                                        4381690B1B4EDCBD00C54D58 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        4381690B1B4EDCBD00C54D58 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };


@@ -26920,9 +31534,6 @@
                                                CreatedOnToolsVersion = 10.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 10.0;
                                                ProvisioningStyle = Automatic;
                                        };

-                                       478D426C1FD72A8100CAB645 = {
-                                               ProvisioningStyle = Automatic;
-                                       };

                                        47C2F1822059CB680062DE30 = {
                                                CreatedOnToolsVersion = 10.0;
                                                ProvisioningStyle = Automatic;
                                        47C2F1822059CB680062DE30 = {
                                                CreatedOnToolsVersion = 10.0;
                                                ProvisioningStyle = Automatic;


@@ -26930,18 +31541,20 @@
                                        47C51B831EEA657D0032D9E5 = {
                                                CreatedOnToolsVersion = 9.0;
                                        };
                                        47C51B831EEA657D0032D9E5 = {
                                                CreatedOnToolsVersion = 9.0;
                                        };

-                                       4809F7A42061B697003E72D0 = {
-                                               CreatedOnToolsVersion = 10.0;
-                                               ProvisioningStyle = Automatic;
+                                       4C32C0AE0A4975F6002891BD = {
+                                               LastSwiftMigration = 1000;

                                        };
                                        5EBE24791B00CCAE0007DB0E = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        };
                                        5EBE24791B00CCAE0007DB0E = {
                                                CreatedOnToolsVersion = 7.0;
                                        };

-                                       6C98082C1E788AEB00E70590 = {
-                                               TestTargetID = 6CF4A0B31E45488B00ECD7B5;
+                                       6C2045E92424BA7E00F9461D = {
+                                               CreatedOnToolsVersion = 12.0;

                                        };
                                        };

-                                       6C9808681E788AFD00E70590 = {
-                                               TestTargetID = 6CF4A0DF1E4549F200ECD7B5;
+                                       6C39234421F13E4D00D018AD = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       6C963280242A279B00C53CE2 = {
+                                               CreatedOnToolsVersion = 12.0;

                                        };
                                        6C9AA79D1F7C1D8F00D08296 = {
                                                CreatedOnToolsVersion = 9.0;
                                        };
                                        6C9AA79D1F7C1D8F00D08296 = {
                                                CreatedOnToolsVersion = 9.0;


@@ -26959,10 +31572,20 @@
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };

-                                       6CF4A0DF1E4549F200ECD7B5 = {
-                                               CreatedOnToolsVersion = 8.3;
+                                       BEAA002A202A832500E51F45 = {
+                                               CreatedOnToolsVersion = 9.3;
+                                               LastSwiftMigration = 0930;
+                                       };
+                                       BEAA0040202B728B00E51F45 = {
+                                               CreatedOnToolsVersion = 9.3;

                                                ProvisioningStyle = Automatic;
                                        };
                                                ProvisioningStyle = Automatic;
                                        };

+                                       BECFA42D20F91AFE00B11002 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                       };
+                                       BED987D22099145300607A5F = {
+                                               CreatedOnToolsVersion = 10.0;
+                                       };

                                        BEF88C271EAFFC3F00357577 = {
                                                CreatedOnToolsVersion = 9.0;
                                                ProvisioningStyle = Automatic;
                                        BEF88C271EAFFC3F00357577 = {
                                                CreatedOnToolsVersion = 9.0;
                                                ProvisioningStyle = Automatic;


@@ -26981,18 +31604,114 @@
                                        D41AD4311B967179008C7270 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        D41AD4311B967179008C7270 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };

+                                       D42C839721159146008D3D83 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D44D1F652115893000E76E1A = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D458C4E0214E1DE00043D982 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D458C505214E20530043D982 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4707A0421136E69005BCFDA = {
+                                               CreatedOnToolsVersion = 10.0;
+                                       };
+                                       D477EE5C21ED476D00C9AAFF = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D477EE6021ED477B00C9AAFF = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D477EE6421ED479500C9AAFF = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D477EE6821ED47C500C9AAFF = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D477EE6C21ED47DA00C9AAFF = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        D4ADA3181E2B41670031CEA3 = {
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
                                        D4ADA3181E2B41670031CEA3 = {
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       D4D1D3FC21AD0B3F0012C66C = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4D1D40121AD0B4B0012C66C = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4D1D40821ADC9720012C66C = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4D1FDDB21165F8B003538E2 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F47B3822270B6E003483E9 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F47B3C22270B89003483E9 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F47B4022270B97003483E9 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56B86217FA32000FCA6B7 = {
+                                               CreatedOnToolsVersion = 10.1;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56B8D217FA3F800FCA6B7 = {
+                                               CreatedOnToolsVersion = 10.1;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56B91217FA40800FCA6B7 = {
+                                               CreatedOnToolsVersion = 10.1;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56BC221813EC900FCA6B7 = {
+                                               CreatedOnToolsVersion = 10.1;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56BC621813ECF00FCA6B7 = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56BCA21813EDC00FCA6B7 = {
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       D4F56BCE21813EE800FCA6B7 = {
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        DA30D6751DF8C8FB00EC6B43 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DA30D6751DF8C8FB00EC6B43 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DA41FE0D2241ADC000838FB3 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        DC008B451D90CE53004002A3 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DC008B451D90CE53004002A3 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DC05037521409A4000A8EDB7 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                       };

                                        DC0BC5501D8B6D2D00070CB0 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        DC0BC5501D8B6D2D00070CB0 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;


@@ -27001,6 +31720,10 @@
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DC0EF8EE208697C600AB9E95 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        DC1789031D77980500B50D50 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        DC1789031D77980500B50D50 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;


@@ -27009,25 +31732,26 @@
                                                CreatedOnToolsVersion = 8.2;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.2;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DC36895D21235F42003A3735 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                       };

                                        DC3A4B571D91E9FB00E46D4A = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DC3A4B571D91E9FB00E46D4A = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DC52E7731D80BC8000B0A59C = {
+                                               LastSwiftMigration = 1000;
+                                       };

                                        DC58C4221D77BDEA003C25A4 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DC5ABDC41D832DAB00CF422C = {
                                                CreatedOnToolsVersion = 8.0;
                                        DC58C4221D77BDEA003C25A4 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DC5ABDC41D832DAB00CF422C = {
                                                CreatedOnToolsVersion = 8.0;

-                                               DevelopmentTeam = XPSUQMMH5W;
-                                               DevelopmentTeamName = "Apple Inc. - Core OS Plus Others";

                                                ProvisioningStyle = Automatic;
                                        };
                                        DC5AC04F1D8352D900CF422C = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DC5AC04F1D8352D900CF422C = {
                                                CreatedOnToolsVersion = 8.0;

-                                               DevelopmentTeam = XPSUQMMH5W;
-                                               DevelopmentTeamName = "Apple Inc. - Core OS Plus Others";
-                                               ProvisioningStyle = Automatic;

                                        };
                                        DC610A461D78F48F002223DE = {
                                                CreatedOnToolsVersion = 8.0;
                                        };
                                        DC610A461D78F48F002223DE = {
                                                CreatedOnToolsVersion = 8.0;


@@ -27037,30 +31761,27 @@
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DC7FC44721EE914C003C39B8 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                       };

                                        DC8E04911D7F6CED006D80EB = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCC78EA81D8088E200865A7C = {
                                                CreatedOnToolsVersion = 8.0;
                                        DC8E04911D7F6CED006D80EB = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCC78EA81D8088E200865A7C = {
                                                CreatedOnToolsVersion = 8.0;

-                                               DevelopmentTeam = XPSUQMMH5W;
-                                               DevelopmentTeamName = "Apple Inc. - Core OS Plus Others";

                                                ProvisioningStyle = Automatic;
                                        };
                                        DCD067561D8CDCF3007602F1 = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCD067561D8CDCF3007602F1 = {
                                                CreatedOnToolsVersion = 8.0;

-                                               DevelopmentTeam = XPSUQMMH5W;

                                                ProvisioningStyle = Automatic;
                                        };
                                                ProvisioningStyle = Automatic;
                                        };

-                                       DCD0675B1D8CDD6D007602F1 = {
-                                               DevelopmentTeam = XPSUQMMH5W;
-                                       };
-                                       DCD069661D8CE105007602F1 = {
-                                               DevelopmentTeam = XPSUQMMH5W;
-                                       };

                                        DCD06A7B1D8CE32F007602F1 = {
                                                CreatedOnToolsVersion = 8.0;
                                        DCD06A7B1D8CE32F007602F1 = {
                                                CreatedOnToolsVersion = 8.0;

-                                               DevelopmentTeam = XPSUQMMH5W;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       DCDA5E4F2124B9C5009B11B2 = {
+                                               CreatedOnToolsVersion = 10.0;

                                                ProvisioningStyle = Automatic;
                                        };
                                        DCE4E7CB1D7A4AED00AFB96E = {
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCE4E7CB1D7A4AED00AFB96E = {


@@ -27083,10 +31804,27 @@
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       DCF216D621ADD5B10029CCC1 = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               LastSwiftMigration = 1200;
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        DCF7889C1D88CB5200E694BB = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCF7889C1D88CB5200E694BB = {
                                                CreatedOnToolsVersion = 8.0;
                                                ProvisioningStyle = Automatic;
                                        };

+                                       E060D19B2124780E0025B833 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       E060D1A62124780F0025B833 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       E060D1B6212478110025B833 = {
+                                               CreatedOnToolsVersion = 10.0;
+                                               ProvisioningStyle = Automatic;
+                                       };

                                        E74584661BF68EBA001B54A4 = {
                                                CreatedOnToolsVersion = 7.1;
                                        };
                                        E74584661BF68EBA001B54A4 = {
                                                CreatedOnToolsVersion = 7.1;
                                        };


@@ -27099,9 +31837,6 @@
                                        E79EEDD81CD3FFC800C2FBFC = {
                                                CreatedOnToolsVersion = 8.0;
                                        };
                                        E79EEDD81CD3FFC800C2FBFC = {
                                                CreatedOnToolsVersion = 8.0;
                                        };

-                                       E79EEDE01CD4000C00C2FBFC = {
-                                               CreatedOnToolsVersion = 8.0;
-                                       };

                                        E7CFF6471C84F61200E3484E = {
                                                CreatedOnToolsVersion = 7.3;
                                        };
                                        E7CFF6471C84F61200E3484E = {
                                                CreatedOnToolsVersion = 7.3;
                                        };


@@ -27111,14 +31846,6 @@
                                        E7D847CD1C6BE9720025BB44 = {
                                                CreatedOnToolsVersion = 7.3;
                                        };
                                        E7D847CD1C6BE9720025BB44 = {
                                                CreatedOnToolsVersion = 7.3;
                                        };

-                                       EB056E3D1FE5E390000A771E = {
-                                               CreatedOnToolsVersion = 9.3;
-                                               ProvisioningStyle = Automatic;
-                                       };
-                                       EB05C4F01FE5E48A00D68712 = {
-                                               CreatedOnToolsVersion = 9.3;
-                                               ProvisioningStyle = Automatic;
-                                       };

                                        EB1055741E14DF430003C309 = {
                                                CreatedOnToolsVersion = 8.2.1;
                                                ProvisioningStyle = Automatic;
                                        EB1055741E14DF430003C309 = {
                                                CreatedOnToolsVersion = 8.2.1;
                                                ProvisioningStyle = Automatic;


@@ -27131,14 +31858,16 @@
                                                CreatedOnToolsVersion = 9.3;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 9.3;
                                                ProvisioningStyle = Automatic;
                                        };

-                                       EB6A6FA81B90F83A0045DC68 = {
-                                               CreatedOnToolsVersion = 7.0;
-                                       };

                                        EB6A6FAE1B90F8810045DC68 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        EB6A6FAE1B90F8810045DC68 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };

-                                       EB6A6FB41B90F8C90045DC68 = {
-                                               CreatedOnToolsVersion = 7.0;
+                                       EB74CC152207E48000F1BBAD = {
+                                               CreatedOnToolsVersion = 11.0;
+                                               ProvisioningStyle = Automatic;
+                                       };
+                                       EB7E90F12193F90700B1FA21 = {
+                                               CreatedOnToolsVersion = 10.1;
+                                               ProvisioningStyle = Automatic;

                                        };
                                        EB9C1D791BDFD0E000F89272 = {
                                                CreatedOnToolsVersion = 7.1;
                                        };
                                        EB9C1D791BDFD0E000F89272 = {
                                                CreatedOnToolsVersion = 7.1;


@@ -27150,46 +31879,30 @@
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };

-                                       EBBE20571C21380100B7A639 = {
-                                               CreatedOnToolsVersion = 7.2;
+                                       EBB851EB22F7912400424FD0 = {
+                                               CreatedOnToolsVersion = 11.0;

                                        };
                                        EBF374711DC055580065D840 = {
                                                CreatedOnToolsVersion = 8.1;
                                                ProvisioningStyle = Automatic;
                                        };
                                        };
                                        EBF374711DC055580065D840 = {
                                                CreatedOnToolsVersion = 8.1;
                                                ProvisioningStyle = Automatic;
                                        };

-                                       F93C49021AB8FCE00047E01A = {
-                                               CreatedOnToolsVersion = 6.3;
-                                       };

                                };
                        };
                        buildConfigurationList = 4C35DB6A094F906D002917C4 /* Build configuration list for PBXProject "Security" */;
                        compatibilityVersion = "Xcode 3.2";
                                };
                        };
                        buildConfigurationList = 4C35DB6A094F906D002917C4 /* Build configuration list for PBXProject "Security" */;
                        compatibilityVersion = "Xcode 3.2";

-                       developmentRegion = English;
+                       developmentRegion = en;

                        hasScannedForEncodings = 0;
                        knownRegions = (
                        hasScannedForEncodings = 0;
                        knownRegions = (

-                               English,
-                               Japanese,
-                               French,
-                               German,

                                en,
                                Base,
                                en,
                                Base,

+                               de,
+                               fr,
+                               ja,

                        );
                        mainGroup = 4C35DB67094F906D002917C4;
                        productRefGroup = 4C35DC36094F9120002917C4 /* Products */;
                        projectDirPath = "";
                        projectReferences = (
                        );
                        mainGroup = 4C35DB67094F906D002917C4;
                        productRefGroup = 4C35DC36094F9120002917C4 /* Products */;
                        projectDirPath = "";
                        projectReferences = (

-                               {
-                                       ProductGroup = DC1002CC1D8E19F20025549C /* Products */;
-                                       ProjectRef = 79BDD3940D60D5F9000D84D3 /* libCMS.xcodeproj */;
-                               },
-                               {
-                                       ProductGroup = DC1002C41D8E19D70025549C /* Products */;
-                                       ProjectRef = DC1784AE1D7786C700B50D50 /* libsecurity_cms.xcodeproj */;
-                               },
-                               {
-                                       ProductGroup = DC1784431D77869A00B50D50 /* Products */;
-                                       ProjectRef = DC1784421D77869A00B50D50 /* libsecurity_smime.xcodeproj */;
-                               },

                                {
                                        ProductGroup = DC5AC0AE1D83533400CF422C /* Products */;
                                        ProjectRef = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;
                                {
                                        ProductGroup = DC5AC0AE1D83533400CF422C /* Products */;
                                        ProjectRef = DC5AC0AD1D83533400CF422C /* securityd_service.xcodeproj */;


@@ -27200,28 +31913,50 @@
                                DC8E04A51D7F6E50006D80EB /* ===== Top-Level Targets ===== */,
                                E79EEDD81CD3FFC800C2FBFC /* Security_frameworks_osx */,
                                0C7CFA2E14E1BA4800DF9D95 /* Security_frameworks_ios */,
                                DC8E04A51D7F6E50006D80EB /* ===== Top-Level Targets ===== */,
                                E79EEDD81CD3FFC800C2FBFC /* Security_frameworks_osx */,
                                0C7CFA2E14E1BA4800DF9D95 /* Security_frameworks_ios */,

-                               E7CFF6471C84F61200E3484E /* Security_KeychainCircle */,
+                               D4F56B8D217FA3F800FCA6B7 /* Security_frameworks_tvos */,
+                               D4F56B91217FA40800FCA6B7 /* Security_frameworks_watchos */,
+                               DC6D1C70208A547400AB21AF /* Security_frameworks_bridge */,
+                               D4D1D40821ADC9720012C66C /* Security_executables_core_osx */,
+                               D4F56B86217FA32000FCA6B7 /* Security_executables_core_ios */,
+                               D4D1D3FC21AD0B3F0012C66C /* Security_executables_core_watchos */,
+                               D4D1D40121AD0B4B0012C66C /* Security_executables_core_tvos */,

                                05EF68BB194915A5007958C3 /* Security_executables_osx */,
                                4C541F840F250BF500E508AE /* Security_executables_ios */,
                                D41AD4311B967179008C7270 /* Security_executables_tvos */,
                                D41AD42D1B967169008C7270 /* Security_executables_watchos */,
                                EB6A6FAE1B90F8810045DC68 /* Security_executables_bridge */,
                                05EF68BB194915A5007958C3 /* Security_executables_osx */,
                                4C541F840F250BF500E508AE /* Security_executables_ios */,
                                D41AD4311B967179008C7270 /* Security_executables_tvos */,
                                D41AD42D1B967169008C7270 /* Security_executables_watchos */,
                                EB6A6FAE1B90F8810045DC68 /* Security_executables_bridge */,

+                               D477EE6821ED47C500C9AAFF /* Security_executables_darwinos_only_osx */,
+                               D477EE6C21ED47DA00C9AAFF /* Security_executables_darwinos_only_ios */,
+                               BEAA0040202B728B00E51F45 /* Security_executables_Swift */,
+                               D4F56BC221813EC900FCA6B7 /* Security_internal_osx */,
+                               D4F56BC621813ECF00FCA6B7 /* Security_internal_ios */,
+                               D4F56BCA21813EDC00FCA6B7 /* Security_internal_tvos */,
+                               D4F56BCE21813EE800FCA6B7 /* Security_internal_watchos */,

                                E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */,
                                E79EEDD21CD3F8AB00C2FBFC /* Security_tests_ios */,
                                E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */,
                                E79EEDD21CD3F8AB00C2FBFC /* Security_tests_ios */,

-                               05EF68C1194915FB007958C3 /* Security_kexts */,
-                               05EF68AF1949149C007958C3 /* Security_temporary_UI */,
-                               4C91273D0ADBF46200AF202E /* ios */,
-                               E74584661BF68EBA001B54A4 /* osx */,
+                               D477EE5C21ED476D00C9AAFF /* Security_tests_bridge */,
+                               D477EE6021ED477B00C9AAFF /* Security_tests_tvos */,
+                               D477EE6421ED479500C9AAFF /* Security_tests_watchos */,
+                               E7CFF6471C84F61200E3484E /* Security_KeychainCircle */,
+                               4C91273D0ADBF46200AF202E /* Security_all_ios */,
+                               E74584661BF68EBA001B54A4 /* Security_all_osx */,
+                               D4F47B3822270B6E003483E9 /* Security_all_watchos */,
+                               D4F47B3C22270B89003483E9 /* Security_all_tvos */,
+                               D4F47B4022270B97003483E9 /* Security_all_bridge */,
+                               DCF216D621ADD5B10029CCC1 /* protobuf_source_generation */,

                                DC8E04991D7F6D9C006D80EB /* ====== Frameworks ======== */,
                                4C32C0AE0A4975F6002891BD /* Security_ios */,
                                DC1789031D77980500B50D50 /* Security_osx */,
                                E7D847C41C6BE9710025BB44 /* KeychainCircle */,
                                BEF88C271EAFFC3F00357577 /* TrustedPeers */,
                                DC8E04991D7F6D9C006D80EB /* ====== Frameworks ======== */,
                                4C32C0AE0A4975F6002891BD /* Security_ios */,
                                DC1789031D77980500B50D50 /* Security_osx */,
                                E7D847C41C6BE9710025BB44 /* KeychainCircle */,
                                BEF88C271EAFFC3F00357577 /* TrustedPeers */,

+                               0CD743A523C3EC8000FA0EC5 /* OctagonTrust */,

                                DC8E04911D7F6CED006D80EB /* ======= Daemons ========= */,
                                DCE4E8931D7F34F600AFB96E /* authd */,
                                DCE4E7F51D7A4DA800AFB96E /* secd */,
                                790851B50CA9859F0083CC4D /* securityd_ios */,
                                DC8E04911D7F6CED006D80EB /* ======= Daemons ========= */,
                                DCE4E8931D7F34F600AFB96E /* authd */,
                                DCE4E7F51D7A4DA800AFB96E /* secd */,
                                790851B50CA9859F0083CC4D /* securityd_ios */,

+                               EB89085621F17D3C00F0DDDB /* recovery_securityd */,

                                4718AE02205B39620068EC3F /* securityd_bridge */,
                                4718AE02205B39620068EC3F /* securityd_bridge */,

+                               EB69527E223B75C300F02C1C /* secitemd */,

                                DC5AC04F1D8352D900CF422C /* securityd_macos */,
                                6CAA8D1F1F842FB3007B6E03 /* securityuploadd */,
                                D41257CE1E9410A300781F23 /* trustd_ios */,
                                DC5AC04F1D8352D900CF422C /* securityd_macos */,
                                6CAA8D1F1F842FB3007B6E03 /* securityuploadd */,
                                D41257CE1E9410A300781F23 /* trustd_ios */,


@@ -27229,16 +31964,19 @@
                                52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */,
                                DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */,
                                DC0BC5631D8B6E3D00070CB0 /* XPCTimeStampingService */,
                                52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */,
                                DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */,
                                DC0BC5631D8B6E3D00070CB0 /* XPCTimeStampingService */,

+                               BEAA002A202A832500E51F45 /* TrustedPeersHelper */,
+                               DA41FE0D2241ADC000838FB3 /* otpaird */,
+                               6C2045E92424BA7E00F9461D /* KeychainStasher */,

                                DC8E04B11D7F6EC9006D80EB /* ======= Libraries ========= */,
                                DC8E04B11D7F6EC9006D80EB /* ======= Libraries ========= */,

+                               DCDA5E4F2124B9C5009B11B2 /* aks_support */,
+                               DC36895D21235F42003A3735 /* aks_mock */,
+                               DC311E6E2124B8A8002F5EAE /* aks_real_witness */,

                                DCC78EA81D8088E200865A7C /* security */,
                                DC52E7731D80BC8000B0A59C /* libsecurityd_ios */,
                                4718AE2E205B39C40068EC3F /* libsecurityd_bridge */,
                                DCC78EA81D8088E200865A7C /* security */,
                                DC52E7731D80BC8000B0A59C /* libsecurityd_ios */,
                                4718AE2E205B39C40068EC3F /* libsecurityd_bridge */,

-                               DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */,

                                D4ADA3181E2B41670031CEA3 /* libtrustd */,
                                DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */,
                                DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */,
                                D4ADA3181E2B41670031CEA3 /* libtrustd */,
                                DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */,
                                DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */,

-                               DC52EA441D80CB7000B0A59C /* SecurityTool */,
-                               DC52EBC61D80CEF100B0A59C /* SecurityCommands */,

                                DC52EC211D80CFB200B0A59C /* SOSCommands */,
                                DC52EC3E1D80D00800B0A59C /* libSWCAgent */,
                                DC52EC521D80D05200B0A59C /* logging */,
                                DC52EC211D80CFB200B0A59C /* SOSCommands */,
                                DC52EC3E1D80D00800B0A59C /* libSWCAgent */,
                                DC52EC521D80D05200B0A59C /* logging */,


@@ -27257,8 +31995,8 @@
                                DC0BCA131D8B82B000070CB0 /* security_ssl_regressions */,
                                DCD06AA91D8E0D53007602F1 /* security_utilities */,
                                225394AC1E3080A600D3CD9B /* security_codesigning_ios */,
                                DC0BCA131D8B82B000070CB0 /* security_ssl_regressions */,
                                DCD06AA91D8E0D53007602F1 /* security_utilities */,
                                225394AC1E3080A600D3CD9B /* security_codesigning_ios */,

-                               DC8834011D8A218F00CE0ACA /* ASN1_not_installed */,
-                               DC71D99F1D95BA6C0065FB93 /* ASN1 */,
+                               DC8834011D8A218F00CE0ACA /* ASN1 */,
+                               D44D1F652115893000E76E1A /* CMS */,

                                DCF782BA1D88B44300E694BB /* ==== macOS Libraries ====== */,
                                DCF7830A1D88B4DE00E694BB /* security_apple_csp */,
                                DCF785021D88B95500E694BB /* security_apple_cspdl */,
                                DCF782BA1D88B44300E694BB /* ==== macOS Libraries ====== */,
                                DCF7830A1D88B4DE00E694BB /* security_apple_csp */,
                                DCF785021D88B95500E694BB /* security_apple_cspdl */,


@@ -27271,6 +32009,8 @@
                                DCB3417B1D8A2B860054D16E /* security_cdsa_utilities */,
                                DC0BC5851D8B70E700070CB0 /* security_cdsa_utils */,
                                DC0BC5B01D8B71FD00070CB0 /* security_checkpw */,
                                DCB3417B1D8A2B860054D16E /* security_cdsa_utilities */,
                                DC0BC5851D8B70E700070CB0 /* security_cdsa_utils */,
                                DC0BC5B01D8B71FD00070CB0 /* security_checkpw */,

+                               D42C839721159146008D3D83 /* security_cms */,
+                               D4D1FDDB21165F8B003538E2 /* security_cms_regressions */,

                                DCD067781D8CDF19007602F1 /* security_codesigning */,
                                DC0BC5E21D8B742200070CB0 /* security_comcryption */,
                                DC0BC5F81D8B752B00070CB0 /* security_cryptkit */,
                                DCD067781D8CDF19007602F1 /* security_codesigning */,
                                DC0BC5E21D8B742200070CB0 /* security_comcryption */,
                                DC0BC5F81D8B752B00070CB0 /* security_cryptkit */,


@@ -27291,18 +32031,19 @@
                                DC0067921D87876F005AF8DB /* securityd_server_macos */,
                                DC0067C51D878898005AF8DB /* securityd_ucspc */,
                                DC8E04951D7F6D80006D80EB /* ========= CLI =========== */,
                                DC0067921D87876F005AF8DB /* securityd_server_macos */,
                                DC0067C51D878898005AF8DB /* securityd_ucspc */,
                                DC8E04951D7F6D80006D80EB /* ========= CLI =========== */,

+                               6C7BE2A923C3DD64003BB2CA /* securitytool_bridge */,

                                4CB740A20A47567C00D641BB /* securitytool_ios */,
                                DC5ABDC41D832DAB00CF422C /* securitytool_macos */,
                                DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */,
                                DC58C4221D77BDEA003C25A4 /* csparser_osx */,
                                BE442BA018B7FDB800F24DAE /* swcagent */,
                                4C52D0B316EFC61E0079966E /* CircleJoinRequested */,
                                4CB740A20A47567C00D641BB /* securitytool_ios */,
                                DC5ABDC41D832DAB00CF422C /* securitytool_macos */,
                                DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */,
                                DC58C4221D77BDEA003C25A4 /* csparser_osx */,
                                BE442BA018B7FDB800F24DAE /* swcagent */,
                                4C52D0B316EFC61E0079966E /* CircleJoinRequested */,

-                               F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */,

                                EBF374711DC055580065D840 /* security-sysdiagnose */,
                                6C9AA79D1F7C1D8F00D08296 /* supdctl */,
                                EB27FF101E402CD300EC9E3A /* ckksctl */,
                                F621D0271ED6DCE7000EA569 /* authorizationdump */,
                                0C8BBEFD1FCB446400580909 /* otctl */,
                                EBF374711DC055580065D840 /* security-sysdiagnose */,
                                6C9AA79D1F7C1D8F00D08296 /* supdctl */,
                                EB27FF101E402CD300EC9E3A /* ckksctl */,
                                F621D0271ED6DCE7000EA569 /* authorizationdump */,
                                0C8BBEFD1FCB446400580909 /* otctl */,

+                               DC0EF8EE208697C600AB9E95 /* tpctl */,

                                DC8E04A11D7F6DFC006D80EB /* ======= Apps ========== */,
                                DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */,
                                DCE4E8DC1D7F39DB00AFB96E /* Cloud Keychain Utility */,
                                DC8E04A11D7F6DFC006D80EB /* ======= Apps ========== */,
                                DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */,
                                DCE4E8DC1D7F39DB00AFB96E /* Cloud Keychain Utility */,


@@ -27316,8 +32057,8 @@
                                DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */,
                                DC3502B41E0208BE00BC0587 /* CKKSTests */,
                                0C85DFD11FB38BB6000343A7 /* OTTests */,
                                DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */,
                                DC3502B41E0208BE00BC0587 /* CKKSTests */,
                                0C85DFD11FB38BB6000343A7 /* OTTests */,

-                               0CF406042072E3E3003D6A7F /* SignInAnalyticsTests_ios */,
-                               0C9AEEAB20783FBB00BF6237 /* SignInAnalyticsTests_osx */,
+                               0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */,
+                               DC99B85B20EACA470065B73B /* OctagonTests */,

                                DC610AAD1D7910C3002223DE /* gk_reset_check_macos */,
                                DC610A551D78F9D2002223DE /* codesign_tests_macos */,
                                DC610A461D78F48F002223DE /* SecTaskTest_macos */,
                                DC610AAD1D7910C3002223DE /* gk_reset_check_macos */,
                                DC610A551D78F9D2002223DE /* codesign_tests_macos */,
                                DC610A461D78F48F002223DE /* SecTaskTest_macos */,


@@ -27333,6 +32074,8 @@
                                EB433A201CC3243600A7EACE /* secitemstresstest */,
                                EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */,
                                DAE40BC520CF3E46002D5674 /* secitemcanarytest */,
                                EB433A201CC3243600A7EACE /* secitemstresstest */,
                                EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */,
                                DAE40BC520CF3E46002D5674 /* secitemcanarytest */,

+                               3E88360824F068EF00E9F4D6 /* secseccodeapitest */,
+                               3E4D49B32531170600B124B3 /* secsecstaticcodeapitest */,

                                DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */,
                                470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
                                DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */,
                                470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,


@@ -27345,21 +32088,23 @@
                                4CE5A54C09C796E100D27A3F /* sslViewer */,
                                DC0BC5C51D8B72E700070CB0 /* test-checkpw */,
                                DC0BC5D51D8B73B000070CB0 /* perf-checkpw */,
                                4CE5A54C09C796E100D27A3F /* sslViewer */,
                                DC0BC5C51D8B72E700070CB0 /* test-checkpw */,
                                DC0BC5D51D8B73B000070CB0 /* perf-checkpw */,

-                               6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */,
-                               6C9808681E788AFD00E70590 /* CKKSCloudKitTests_ios */,
-                               6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */,
-                               6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */,
+                               6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */,

                                6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */,
                                47C51B831EEA657D0032D9E5 /* SecurityUnitTests */,
                                6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */,
                                47C51B831EEA657D0032D9E5 /* SecurityUnitTests */,

-                               4809F7A42061B697003E72D0 /* MultiPeerSimulatorTests */,
-                               EB05C4F01FE5E48A00D68712 /* MultiDeviceSimulatorTests */,
-                               EB056E3D1FE5E390000A771E /* DeviceSimulator */,
-                               4727FBB61F9918580003AE36 /* secdxctests_ios */,
-                               478D426C1FD72A8100CAB645 /* secdxctests_mac */,
+                               4727FBB61F9918580003AE36 /* secdxctests */,

                                EB49B2AD202D877F003F34A0 /* secdmockaks */,
                                EB49B2AD202D877F003F34A0 /* secdmockaks */,

-                               3DD1FEF5201C07F30086D049 /* SecureTransport_macos_tests */,
-                               3DD1FFAC201FDB1D0086D049 /* SecureTransport_ios_tests */,
+                               6C39234421F13E4D00D018AD /* SecDbBackupTests */,
+                               3DD1FEF5201C07F30086D049 /* SecureTransportTests_macos */,
+                               3DD1FFAC201FDB1D0086D049 /* SecureTransportTests_ios */,
+                               BED987D22099145300607A5F /* TrustedPeersHelperUnitTests */,
+                               DCBF4A8A21FFC82100539F0A /* SecEscrowRequestTests */,
+                               EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */,
+                               D458C505214E20530043D982 /* TrustTests */,
+                               D458C4E0214E1DE00043D982 /* TrustTestsRunner_ios */,
+                               D4707A0421136E69005BCFDA /* TrustTests_ios */,
+                               D453A4A42122236D00850A26 /* TrustTests_macos */,
+                               6C963280242A279B00C53CE2 /* stashtester */,

                                DC5AC1351D835D9700CF422C /* ===== Source Gen ===== */,
                                DC008B451D90CE53004002A3 /* securityd_macos_mig */,
                                DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */,
                                DC5AC1351D835D9700CF422C /* ===== Source Gen ===== */,
                                DC008B451D90CE53004002A3 /* securityd_macos_mig */,
                                DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */,


@@ -27370,12 +32115,15 @@
                                DC63CAE81D90D63500C03317 /* libsecurityd_macos_mig */,
                                DCD067561D8CDCF3007602F1 /* codesigning_DTrace */,
                                DCD0675B1D8CDD6D007602F1 /* codesigning_SystemPolicy */,
                                DC63CAE81D90D63500C03317 /* libsecurityd_macos_mig */,
                                DCD067561D8CDCF3007602F1 /* codesigning_DTrace */,
                                DCD0675B1D8CDD6D007602F1 /* codesigning_SystemPolicy */,

+                               BECFA42D20F91AFE00B11002 /* tppolicy */,

                                DC8E04AD1D7F6E76006D80EB /* ======= misc ========= */,
                                DC8E04AD1D7F6E76006D80EB /* ======= misc ========= */,

+                               DC7FC44721EE914C003C39B8 /* FeatureFlagsPlist */,

                                E7B01BBD166594AB000485F1 /* SyncDevTest2 */,
                                5E10992419A5E55800A60E2B /* ISACLProtectedItems */,
                                5346480017331E1100FE9172 /* KeychainSyncAccountNotification */,
                                DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */,
                                4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */,
                                E7B01BBD166594AB000485F1 /* SyncDevTest2 */,
                                5E10992419A5E55800A60E2B /* ISACLProtectedItems */,
                                5346480017331E1100FE9172 /* KeychainSyncAccountNotification */,
                                DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */,
                                4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */,

+                               EB74CC152207E48000F1BBAD /* KeychainSettings */,

                                DCD0696B1D8CE1F9007602F1 /* ==== Code Signing ===== */,
                                DCD06A7B1D8CE32F007602F1 /* All Codesigning */,
                                DCD0696F1D8CE21C007602F1 /* integrity */,
                                DCD0696B1D8CE1F9007602F1 /* ==== Code Signing ===== */,
                                DCD06A7B1D8CE32F007602F1 /* All Codesigning */,
                                DCD0696F1D8CE21C007602F1 /* integrity */,


@@ -27389,69 +32137,22 @@
                                DC8E04A91D7F6E63006D80EB /* === Legacy Targets ===== */,
                                DCF7889C1D88CB5200E694BB /* plugin_apple_x509_cl */,
                                EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */,
                                DC8E04A91D7F6E63006D80EB /* === Legacy Targets ===== */,
                                DCF7889C1D88CB5200E694BB /* plugin_apple_x509_cl */,
                                EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */,

-                               EBBE20571C21380100B7A639 /* SecurityFeatures */,
-                               4C541F950F250C3000E508AE /* phase1 */,
-                               EB6A6FA81B90F83A0045DC68 /* phase1_ios */,
-                               EB6A6FB41B90F8C90045DC68 /* phase2 */,
-                               E79EEDE01CD4000C00C2FBFC /* Security_executables */,
-                               05EF68B519491512007958C3 /* Security_frameworks */,

                                F667EC561E96E9B100203D5C /* authdtest */,
                                47C2F1822059CB680062DE30 /* KeychainResources */,
                                4771D971209A755800BA9772 /* KeychainDataclassOwner */,
                                F667EC561E96E9B100203D5C /* authdtest */,
                                47C2F1822059CB680062DE30 /* KeychainResources */,
                                4771D971209A755800BA9772 /* KeychainDataclassOwner */,

+                               DC05037521409A4000A8EDB7 /* OCMockUmbrella */,
+                               E060D19B2124780E0025B833 /* OctagonTestHarness */,
+                               E060D1A62124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol */,
+                               E060D1B6212478110025B833 /* OctagonTestHarnessXPCService */,
+                               EB7E90F12193F90700B1FA21 /* Build C2 Metrics */,
+                               3D58392D21890FFB000ACA44 /* SecExperimentTests */,
+                               5A442F81233C330F00918373 /* experimentTool */,
+                               0CA378E123876DD100090B7E /* reset_account */,

                        );
                };
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
                        );
                };
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */

-               DC1002C91D8E19D70025549C /* libsecurity_cms.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libsecurity_cms.a;
-                       remoteRef = DC1002C81D8E19D70025549C /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC1002CB1D8E19D70025549C /* libsecurity_cms_regressions.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libsecurity_cms_regressions.a;
-                       remoteRef = DC1002CA1D8E19D70025549C /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC1002D31D8E19F20025549C /* security_smime */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = "compiled.mach-o.dylib";
-                       path = security_smime;
-                       remoteRef = DC1002D21D8E19F20025549C /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC1002D51D8E19F20025549C /* security_smime.framework */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = wrapper.framework;
-                       path = security_smime.framework;
-                       remoteRef = DC1002D41D8E19F20025549C /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC1002D71D8E19F20025549C /* libCMS.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libCMS.a;
-                       remoteRef = DC1002D61D8E19F20025549C /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC1784491D77869A00B50D50 /* libsecurity_smime.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libsecurity_smime.a;
-                       remoteRef = DC1784481D77869A00B50D50 /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               DC17844B1D77869A00B50D50 /* libsecurity_smime_regressions.a */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = archive.ar;
-                       path = libsecurity_smime_regressions.a;
-                       remoteRef = DC17844A1D77869A00B50D50 /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };

                DC5AC0B51D83533400CF422C /* securityd_service */ = {
                        isa = PBXReferenceProxy;
                        fileType = "compiled.mach-o.executable";
                DC5AC0B51D83533400CF422C /* securityd_service */ = {
                        isa = PBXReferenceProxy;
                        fileType = "compiled.mach-o.executable";


@@ -27483,34 +32184,31 @@
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */

-               4381690A1B4EDCBD00C54D58 /* Resources */ = {
+               0CCC227423F357EE00E1FCD0 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               4771D970209A755800BA9772 /* Resources */ = {
+               4381690A1B4EDCBD00C54D58 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               47C2F1812059CB680062DE30 /* Resources */ = {
+               4771D970209A755800BA9772 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               47C51B821EEA657D0032D9E5 /* Resources */ = {
+               47C2F1812059CB680062DE30 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               D465131A2097FF2E005D93FE /* Main.storyboard in Resources */,
-                               D465131B2097FF2E005D93FE /* Assets.xcassets in Resources */,
-                               D465131C2097FF2E005D93FE /* LaunchScreen.storyboard in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27520,17 +32218,15 @@
                        files = (
                                D4C263CF1F953019001317EA /* SecDebugErrorMessages.strings in Resources */,
                                D4C263CE1F95300F001317EA /* SecErrorMessages.strings in Resources */,
                        files = (
                                D4C263CF1F953019001317EA /* SecDebugErrorMessages.strings in Resources */,
                                D4C263CE1F95300F001317EA /* SecErrorMessages.strings in Resources */,

-                               47922D4F1FAA7D5C0008F7E0 /* SecDbKeychainSerializedItemV7.proto in Resources */,

                                53C0E1FF177FB48A00F8A018 /* CloudKeychain.strings in Resources */,
                                BE4AC9BA18B8273600B84964 /* SharedWebCredentials.strings in Resources */,
                                DCEE1E861D93427400DC0EB7 /* com.apple.securityd.plist 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 */,
                                EB433A2E1CC325E900A7EACE /* secitemstresstest.entitlements 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 */,
                                475F37201EE8F23900248FB5 /* SFAnalytics.plist in Resources */,
                                4C198F220ACDB4BF00AAB142 /* Certificate.strings in Resources */,
                                4C198F230ACDB4BF00AAB142 /* OID.strings in Resources */,
                                D479F6E21F980FAB00388D28 /* Trust.strings in Resources */,

+                               6C5D62A6221B6E3F00AF79DC /* secdxctests-entitlements.plist in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27540,12 +32236,6 @@
                        files = (
                                52A23EDD161DEC3F00E271E0 /* Default-568h@2x.png in Resources */,
                                D4D886E91CEBDD2A00DC7583 /* nist-certs in Resources */,
                        files = (
                                52A23EDD161DEC3F00E271E0 /* Default-568h@2x.png in Resources */,
                                D4D886E91CEBDD2A00DC7583 /* nist-certs in Resources */,

-                               D4D886BF1CEB9F3B00DC7583 /* ssl-policy-certs in Resources */,
-                               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;
                };


@@ -27565,54 +32255,87 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6C98085D1E788AEB00E70590 /* Resources */ = {
+               6CF4A0B21E45488B00ECD7B5 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               BE197F2419116FD100BA91D1 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               BE197F2C19116FD100BA91D1 /* InfoPlist.strings in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6C9808991E788AFD00E70590 /* Resources */ = {
+               BEAA0029202A832500E51F45 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6CF4A0B21E45488B00ECD7B5 /* Resources */ = {
+               BED987D12099145300607A5F /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6CF4A0DE1E4549F200ECD7B5 /* Resources */ = {
+               BEF88C261EAFFC3F00357577 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               BE197F2419116FD100BA91D1 /* Resources */ = {
+               BEF88C2E1EAFFC3F00357577 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               BE197F61191173F200BA91D1 /* entitlements.plist in Resources */,
-                               BE197F2C19116FD100BA91D1 /* InfoPlist.strings in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               BEF88C261EAFFC3F00357577 /* Resources */ = {
+               D453A4BB2122236D00850A26 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D4B2966B22DBFDD300DCF250 /* TestCopyProperties_ios-data in Resources */,
+                               D4D92DA9227890500009A7CF /* nist-certs in Resources */,
+                               D4231149237261F8000E470A /* SMIMEPolicyTests-data in Resources */,
+                               D4056A2022712D750026E24E /* ssl-policy-certs in Resources */,
+                               D4AC8BEF213212A7006E9871 /* si-18-certificate-parse in Resources */,
+                               D458C51A214E2CC80043D982 /* si-20-sectrust-policies-data in Resources */,
+                               D453A4BC2122236D00850A26 /* si-82-sectrust-ct-data in Resources */,
+                               D4FD4226217D7C41002B7EE2 /* si-87-sectrust-name-constraints in Resources */,
+                               D477CB79237E484300C02355 /* si-88-sectrust-valid-data in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               BEF88C2E1EAFFC3F00357577 /* Resources */ = {
+               D458C4DF214E1DE00043D982 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D458C51F214E2E0C0043D982 /* Main.storyboard in Resources */,
+                               D458C51C214E2DEB0043D982 /* Assets.xcassets in Resources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D4707A0321136E69005BCFDA /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4B2966A22DBFDC700DCF250 /* TestCopyProperties_ios-data in Resources */,
+                               D4D92DA8227890500009A7CF /* nist-certs in Resources */,
+                               D4231148237261F8000E470A /* SMIMEPolicyTests-data in Resources */,
+                               D4056A1F22712D750026E24E /* ssl-policy-certs in Resources */,
+                               D4AC8BEE21321291006E9871 /* si-18-certificate-parse in Resources */,
+                               D458C517214E2C690043D982 /* si-20-sectrust-policies-data in Resources */,
+                               D4A0F8C2211E6A2F00443CA1 /* si-82-sectrust-ct-data in Resources */,
+                               D4FD4227217D7C4F002B7EE2 /* si-87-sectrust-name-constraints in Resources */,
+                               D477CB78237E482800C02355 /* si-88-sectrust-valid-data in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27623,6 +32346,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC05037421409A4000A8EDB7 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC0BC54F1D8B6D2D00070CB0 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                DC0BC54F1D8B6D2D00070CB0 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -27645,7 +32375,6 @@
                                DC178A471D77A1F600B50D50 /* InfoPlist.strings in Resources */,
                                DC178A241D77A1E700B50D50 /* cspdl_common.mdsinfo in Resources */,
                                DC178A2B1D77A1E700B50D50 /* cl_primary.mdsinfo in Resources */,
                                DC178A471D77A1F600B50D50 /* InfoPlist.strings in Resources */,
                                DC178A241D77A1E700B50D50 /* cspdl_common.mdsinfo in Resources */,
                                DC178A2B1D77A1E700B50D50 /* cl_primary.mdsinfo in Resources */,

-                               DC178A451D77A1F600B50D50 /* framework.sb in Resources */,

                                DC178A2D1D77A1E700B50D50 /* tp_policyOids.mdsinfo in Resources */,
                                DC178A231D77A1E700B50D50 /* csp_primary.mdsinfo in Resources */,
                                DC178A251D77A1E700B50D50 /* cspdl_csp_capabilities.mdsinfo in Resources */,
                                DC178A2D1D77A1E700B50D50 /* tp_policyOids.mdsinfo in Resources */,
                                DC178A231D77A1E700B50D50 /* csp_primary.mdsinfo in Resources */,
                                DC178A251D77A1E700B50D50 /* cspdl_csp_capabilities.mdsinfo in Resources */,


@@ -27667,7 +32396,11 @@
                                DC178A481D77A1F600B50D50 /* TimeStampingPrefs.plist in Resources */,
                                DC178A201D77A1E700B50D50 /* csp_capabilities.mdsinfo in Resources */,
                                DC178A2C1D77A1E700B50D50 /* tp_common.mdsinfo in Resources */,
                                DC178A481D77A1F600B50D50 /* TimeStampingPrefs.plist in Resources */,
                                DC178A201D77A1E700B50D50 /* csp_capabilities.mdsinfo in Resources */,
                                DC178A2C1D77A1E700B50D50 /* tp_common.mdsinfo in Resources */,

-                               DC178A491D77A1F600B50D50 /* authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings in Resources */,
+                               DC178A491D77A1F600B50D50 /* authorization.dfr.prompts.strings in Resources */,
+                               D479F6E31F981FD600388D28 /* OID.strings in Resources */,
+                               D479F6E41F981FD600388D28 /* Certificate.strings in Resources */,
+                               D479F6E51F981FD600388D28 /* Trust.strings in Resources */,
+                               DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27685,18 +32418,23 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC7FC44621EE914C003C39B8 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DC99B88E20EACA470065B73B /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCE4E76B1D7A43B500AFB96E /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */,
                DCE4E76B1D7A43B500AFB96E /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */,

-                               DCE4E76E1D7A43B500AFB96E /* ssl-policy-certs in Resources */,
-                               D4AA64881E97275200D317ED /* si-18-certificate-parse 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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27742,12 +32480,6 @@
                        files = (
                                52A23EDC161DEC3800E271E0 /* Default-568h@2x.png in Resources */,
                                D4D886EA1CEBDE0800DC7583 /* nist-certs in Resources */,
                        files = (
                                52A23EDC161DEC3800E271E0 /* Default-568h@2x.png in Resources */,
                                D4D886EA1CEBDE0800DC7583 /* nist-certs in Resources */,

-                               D4D886C01CEB9F7200DC7583 /* ssl-policy-certs in Resources */,
-                               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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -27772,24 +32504,27 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               EB05C4EF1FE5E48A00D68712 /* Resources */ = {
+               EB108F3A1E6CE4D2003B0456 /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               EB108F3A1E6CE4D2003B0456 /* Resources */ = {
+               EB74CC142207E48000F1BBAD /* Resources */ = {

                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               EB74CC282207EE4300F1BBAD /* KeychainSettings.plist in Resources */,
+                               EB74CC2F2207FBF600F1BBAD /* KeychainSettingsOctagonPeers.plist in Resources */,
+                               EBB02A6A2220649F007241CB /* KeychainSettingsCKKSViews.plist in Resources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */

-               090585D020AEF9D300BB7490 /* Install OCMock framework */ = {
+               090585D120AEF9FE00BB7490 /* Install OCMock framework */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (


@@ -27803,21 +32538,20 @@
                        shellPath = /bin/sh;
                        shellScript = "sh xcscripts/install-test-framework.sh OCMock.framework\n";
                };
                        shellPath = /bin/sh;
                        shellScript = "sh xcscripts/install-test-framework.sh OCMock.framework\n";
                };

-               090585D120AEF9FE00BB7490 /* Install OCMock framework */ = {
+               0C85DFFF1FB38BB6000343A7 /* ShellScript */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );

-                       name = "Install OCMock framework";

                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "sh xcscripts/install-test-framework.sh OCMock.framework";
+                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\n#Disable until this places a plist in this directory\n#chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                };
                };

-               0C85DFFF1FB38BB6000343A7 /* ShellScript */ = {
+               3DD1FF49201C07F30086D049 /* ShellScript */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (


@@ -27828,9 +32562,9 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\n#Disable until this places a plist in this directory\n#chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
+                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                };
                };

-               3DD1FF49201C07F30086D049 /* ShellScript */ = {
+               3DD1FFCC201FDB1D0086D049 /* ShellScript */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (


@@ -27843,77 +32577,110 @@
                        shellPath = /bin/sh;
                        shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
                };
                        shellPath = /bin/sh;
                        shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
                };

-               3DD1FFCC201FDB1D0086D049 /* ShellScript */ = {
+               6CAA8D361F84317F007B6E03 /* Install launchd plist */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );

+                       name = "Install launchd plist";

                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
+                       shellScript = "mkdir -p \"$LAUNCHD_PLIST_LOCATION\"\nplutil -convert binary1 -o \"$LAUNCHD_PLIST_LOCATION/com.apple.securityuploadd.plist\" \"$LAUNCHD_PLIST\"\n";

                };
                };

-               5EE098DE1CD21661009FCA27 /* Unifdef RC_HIDE_J79/J80 */ = {
+               8E64DB4E1C18A5B80076C9DF /* Install launchd plist */ = {

                        isa = PBXShellScriptBuildPhase;
                        isa = PBXShellScriptBuildPhase;

-                       buildActionMask = 2147483647;
+                       buildActionMask = 8;

                        files = (
                        );
                        inputPaths = (
                        files = (
                        );
                        inputPaths = (

+                               "$(PROJECT_DIR)/KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.ios.plist",
+                               "$(PROJECT_DIR)/KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.osx.plist",

                        );
                        );

-                       name = "Unifdef RC_HIDE_J79/J80";
+                       name = "Install launchd plist";

                        outputPaths = (
                        outputPaths = (

+                               "$(INSTALL_ROOT)/$(INSTALL_DAEMON_AGENT_DIR)/com.apple.security.cloudkeychainproxy3.plist",

                        );
                        );

-                       runOnlyForDeploymentPostprocessing = 0;
+                       runOnlyForDeploymentPostprocessing = 1;

                        shellPath = /bin/sh;
                        shellPath = /bin/sh;

-                       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;
+                       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\n";

                };
                };

-               6CAA8D361F84317F007B6E03 /* Install launchd plist */ = {
+               D428337D24E1D0B10068B2F5 /* Remove Name Constraints Resources from watchOS */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );

+                       inputFileListPaths = (
+                       );

                        inputPaths = (
                        );
                        inputPaths = (
                        );

-                       name = "Install launchd plist";
+                       name = "Remove Name Constraints Resources from watchOS";
+                       outputFileListPaths = (
+                       );

                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        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\"";
+                       shellScript = "# see <rdar://66792084>\nif [ \"${PLATFORM_NAME}\" == \"watchos\" ]; then\n    rm -rf \"$DSTROOT/AppleInternal/XCTests/com.apple.security/TrustTests.xctest/si-87-sectrust-name-constraints\"\nfi\n";

                };
                };

-               6CB5F4761E402D0000DBF3F0 /* ShellScript */ = {
+               D42D044424734050004E7AA2 /* Install sandbox profile for macOS */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );

+                       inputFileListPaths = (
+                       );

                        inputPaths = (
                        inputPaths = (

+                               "$(SRCROOT)/supd/com.apple.securityuploadd.sb",
+                       );
+                       name = "Install sandbox profile for macOS";
+                       outputFileListPaths = (

                        );
                        outputPaths = (
                        );
                        outputPaths = (

+                               "$(DSTROOT)/System/Library/Sandbox/Profiles/com.apple.securityuploadd.sb",

                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
+                       shellScript = "if [ \"${PLATFORM_NAME}\" == \"macosx\" ]; then\n    mkdir /System/Library/Sandbox/Profiles\n    cp \"$SRCROOT/supd/com.apple.securityuploadd.sb\" \"$DSTROOT/System/Library/Sandbox/Profiles/com.apple.securityuploadd.sb\"\nfi\n";

                };
                };

-               8E64DB4E1C18A5B80076C9DF /* Install launchd plist */ = {
+               D4428B432122718400EB8448 /* Generate BATS Plist */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );

+                       inputFileListPaths = (
+                       );

                        inputPaths = (
                        inputPaths = (

-                               "$(PROJECT_DIR)/KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.ios.plist",
-                               "$(PROJECT_DIR)/KVSKeychainSyncingProxy/com.apple.security.cloudkeychainproxy3.osx.plist",

                        );
                        );

-                       name = "Install launchd plist";
+                       name = "Generate BATS Plist";
+                       outputFileListPaths = (
+                       );

                        outputPaths = (
                        outputPaths = (

-                               "$(INSTALL_ROOT)/$(INSTALL_DAEMON_AGENT_DIR)/com.apple.security.cloudkeychainproxy3.plist",

                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        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\n";
+                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\n TRUSTTESTS_DIR=${SRCROOT}/tests/TrustTests\n \n python ${TRUSTTESTS_DIR}/gen_test_plist.py ${TRUSTTESTS_DIR} ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/TrustTests.plist\n chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";
+               };
+               D4428B46212271E400EB8448 /* Generate BATS Plist */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Generate BATS Plist";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\n TRUSTTESTS_DIR=${SRCROOT}/tests/TrustTests\n \n python ${TRUSTTESTS_DIR}/gen_test_plist.py ${TRUSTTESTS_DIR} ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/TrustTests.plist\n chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                };
                D442AD70215C39100050B50F /* Install Apple Corporate Roots */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                D442AD70215C39100050B50F /* Install Apple Corporate Roots */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -27923,8 +32690,30 @@
                        inputFileListPaths = (
                        );
                        inputPaths = (
                        inputFileListPaths = (
                        );
                        inputPaths = (

-                               "$(SRCROOT)/OSX/trustd/iOS/AppleCorporateRootCA.cer",
-                               "$(SRCROOT)/OSX/trustd/iOS/AppleCorporateRootCA2.cer",
+                               "$(SRCROOT)/trust/trustd/iOS/AppleCorporateRootCA.cer",
+                               "$(SRCROOT)/trust/trustd/iOS/AppleCorporateRootCA2.cer",
+                       );
+                       name = "Install Apple Corporate Roots";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                               "$(DSTROOT)/AppleInternal/Library/Security/AppleCorporateRootCA.cer",
+                               "$(DSTROOT)/AppleInternal/Library/Security/AppleCorporateRootCA2.cer",
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "ditto ${SRCROOT}/trust/trustd/iOS/AppleCorporateRootCA.cer ${DSTROOT}/AppleInternal/Library/Security/\nditto ${SRCROOT}/trust/trustd/iOS/AppleCorporateRootCA2.cer ${DSTROOT}/AppleInternal/Library/Security/\nchown -R root:wheel ${DSTROOT}/AppleInternal/Library/Security/\n";
+               };
+               D459364124BFBA700066FB43 /* Install Apple Corporate Roots */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                               "$(SRCROOT)/trust/trustd/iOS/AppleCorporateRootCA.cer",
+                               "$(SRCROOT)/trust/trustd/iOS/AppleCorporateRootCA2.cer",

                        );
                        name = "Install Apple Corporate Roots";
                        outputFileListPaths = (
                        );
                        name = "Install Apple Corporate Roots";
                        outputFileListPaths = (


@@ -27935,7 +32724,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "ditto ${SRCROOT}/OSX/trustd/iOS/AppleCorporateRootCA.cer ${DSTROOT}/AppleInternal/Library/Security/\nditto ${SRCROOT}/OSX/trustd/iOS/AppleCorporateRootCA2.cer ${DSTROOT}/AppleInternal/Library/Security/\nchown -R root:wheel ${DSTROOT}/AppleInternal/Library/Security/\n";
+                       shellScript = "ditto ${SRCROOT}/trust/trustd/iOS/AppleCorporateRootCA.cer ${DSTROOT}/AppleInternal/Library/Security/\nditto ${SRCROOT}/trust/trustd/iOS/AppleCorporateRootCA2.cer ${DSTROOT}/AppleInternal/Library/Security/\nchown -R root:wheel ${DSTROOT}/AppleInternal/Library/Security/\n\n";

                };
                D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -27950,11 +32739,47 @@
                        name = "Run Script Generate Error Strings";
                        outputPaths = (
                                "${BUILT_PRODUCTS_DIR}/derived_src/SecDebugErrorMessages.strings",
                        name = "Run Script Generate Error Strings";
                        outputPaths = (
                                "${BUILT_PRODUCTS_DIR}/derived_src/SecDebugErrorMessages.strings",

-                               "${BUILT_PRODUCTS_DIR}/derived_src/English.lproj/SecErrorMessages.strings",
+                               "${BUILT_PRODUCTS_DIR}/derived_src/en.lproj/SecErrorMessages.strings",

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        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";
+                       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/SecureTransport.h\" \\\n\"${BUILT_PRODUCTS_DIR}/Security.framework/Headers/SecBase.h\" \\\n\"${BUILT_PRODUCTS_DIR}/Security.framework/PrivateHeaders/CSCommon.h\"\ndone\n";
+               };
+               D4E0E9C32224E18900A802E0 /* ShellScript */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "# alias/target to be obsoleted\nmkdir -p ${DSTROOT}/AppleInternal/CoreOS/Security/\necho \"shut up now\" > ${DSTROOT}/AppleInternal/CoreOS/Security/Security_KeychainCircle_quiet_verifier.txt\n";
+                       showEnvVarsInLog = 0;
+               };
+               DA41FE162241AE9100838FB3 /* Install launchd plist */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Install launchd plist";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "set -e\nset -x\n\nmkdir -p ${DSTROOT}${SYSTEM_LIBRARY_DIR}/NanoLaunchDaemons\nplutil -convert binary1 -o ${DSTROOT}${SYSTEM_LIBRARY_DIR}/NanoLaunchDaemons/com.apple.security.otpaird.plist ${SRCROOT}/keychain/otpaird/${OTPAIRD_LAUNCHD_PLIST}\n";

                };
                DC008B581D90CE70004002A3 /* securityd mig */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC008B581D90CE70004002A3 /* securityd mig */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -27962,13 +32787,13 @@
                        files = (
                        );
                        inputPaths = (
                        files = (
                        );
                        inputPaths = (

-                               "${SRCROOT}/securityd/mig/self.defs",
+                               "$(SRCROOT)/securityd/mig/self.defs",

                        );
                        name = "securityd mig";
                        outputPaths = (
                        );
                        name = "securityd mig";
                        outputPaths = (

-                               "${BUILT_PRODUCTS_DIR}/derived_src/self.h",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/selfUser.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/selfServer.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/self.h",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/selfUser.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/selfServer.cpp",

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;


@@ -28026,7 +32851,26 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "if [ ! -h ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/XPCServices ]; then\n    ln -s Versions/Current/XPCServices ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/XPCServices\nfi\n\nexit 0";
+                       shellScript = "if [ ! -h ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/XPCServices ]; then\n    ln -s Versions/Current/XPCServices ${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}/XPCServices\nfi\n\nexit 0\n";
+               };
+               DC2C884D245B4B3E0040CBEB /* Copy Sandbox Profile (macOS only) */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 8;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                               "$(SRCROOT)/keychain/TrustedPeersHelper/com.apple.TrustedPeersHelper.sb",
+                       );
+                       name = "Copy Sandbox Profile (macOS only)";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 1;
+                       shellPath = /bin/sh;
+                       shellScript = "if [ \"$PLATFORM_FAMILY_NAME\" = \"macOS\" ]; then\n    mkdir -p ${INSTALL_ROOT}/System/Library/Sandbox/Profiles/\n    cp ${SRCROOT}/keychain/TrustedPeersHelper/com.apple.TrustedPeersHelper.sb ${INSTALL_ROOT}/System/Library/Sandbox/Profiles/\nfi\n";

                };
                DC58C4381D77BE5E003C25A4 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC58C4381D77BE5E003C25A4 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28048,26 +32892,23 @@
                        files = (
                        );
                        inputPaths = (
                        files = (
                        );
                        inputPaths = (

-                               "${PROJECT_DIR}/mig/ss_types.defs",
-                               "${PROJECT_DIR}/mig/ucsp.defs",
-                               "${PROJECT_DIR}/mig/ucspNotify.defs",
-                               "${PROJECT_DIR}/mig/cshosting.defs",
+                               "$(PROJECT_DIR)/mig/ss_types.defs",
+                               "$(PROJECT_DIR)/mig/ucsp.defs",
+                               "$(PROJECT_DIR)/mig/ucspNotify.defs",

                        );
                        name = "libsecurityd mig";
                        outputPaths = (
                        );
                        name = "libsecurityd mig";
                        outputPaths = (

-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucsp.h",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspServer.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClient.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotify.h",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifyReceiver.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifySender.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshosting.h",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshostingServer.cpp",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshostingClient.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucsp.h",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspServer.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspClient.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspNotify.h",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspNotifyReceiver.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspNotifySender.cpp",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_client/ucspClientC.c",

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "\nmkdir -p ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client\n\nxcrun mig -isysroot \"${SDKROOT}\" \\\n-server ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspServer.cpp \\\n-user ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClient.cpp \\\n-header ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucsp.h \\\n${PROJECT_DIR}/OSX/libsecurityd/mig/ucsp.defs\n\ncp ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClient.cpp ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClientC.c\n\nxcrun mig -isysroot \"${SDKROOT}\" \\\n-server ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifyReceiver.cpp \\\n-user ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifySender.cpp \\\n-header ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotify.h \\\n${PROJECT_DIR}/OSX/libsecurityd/mig/ucspNotify.defs\n\nxcrun mig -isysroot \"${SDKROOT}\" \\\n-server ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshostingServer.cpp \\\n-user ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshostingClient.cpp \\\n-header ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/cshosting.h \\\n${PROJECT_DIR}/OSX/libsecurityd/mig/cshosting.defs";
+                       shellScript = "\nmkdir -p ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client\n\nxcrun mig -isysroot \"${SDKROOT}\" \\\n-server ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspServer.cpp \\\n-user ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClient.cpp \\\n-header ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucsp.h \\\n${PROJECT_DIR}/OSX/libsecurityd/mig/ucsp.defs\n\ncp ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClient.cpp ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspClientC.c\n\nxcrun mig -isysroot \"${SDKROOT}\" \\\n-server ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifyReceiver.cpp \\\n-user ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotifySender.cpp \\\n-header ${BUILT_PRODUCTS_DIR}/derived_src/securityd_client/ucspNotify.h \\\n${PROJECT_DIR}/OSX/libsecurityd/mig/ucspNotify.defs\n";

                };
                DC6BC2761D90D0BE00DD57B3 /* securityd DTrace */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC6BC2761D90D0BE00DD57B3 /* securityd DTrace */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28075,15 +32916,15 @@
                        files = (
                        );
                        inputPaths = (
                        files = (
                        );
                        inputPaths = (

-                               "${SRCROOT}/securityd/src/securityd.d",
+                               "$(SRCROOT)/securityd/src/securityd.d",

                        );
                        name = "securityd DTrace";
                        outputPaths = (
                        );
                        name = "securityd DTrace";
                        outputPaths = (

-                               $BUILT_PRODUCTS_DIR/derived_src/securityd_dtrace.h,
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/securityd_dtrace.h",

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "mkdir -p $BUILT_PRODUCTS_DIR/derived_src\n/usr/sbin/dtrace -h -C -s ${SRCROOT}/securityd/src/securityd.d -o $BUILT_PRODUCTS_DIR/derived_src/securityd_dtrace.h";
+                       shellScript = "set -e\nmkdir -p \"$BUILT_PRODUCTS_DIR/derived_src\" && xcrun usdtheadergen -C -s \"${SRCROOT}/securityd/src/securityd.d\" -o $BUILT_PRODUCTS_DIR/derived_src/securityd_dtrace.h\n";

                };
                DC6BC27D1D90D1EE00DD57B3 /* cssm generator */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC6BC27D1D90D1EE00DD57B3 /* cssm generator */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28102,14 +32943,14 @@
                        );
                        name = "cssm generator";
                        outputPaths = (
                        );
                        name = "cssm generator";
                        outputPaths = (

-                               "${BUILT_PRODUCTS_DIR}/derived_src/cssmexports.gen",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/funcnames.gen",
-                               "$(DERIVED_FILE_DIR)/${BUILT_PRODUCTS_DIR}/derived_src/generator.rpt",
-                               "${BUILT_PRODUCTS_DIR}/derived_src/transition.gen",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/cssmexports.gen",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/funcnames.gen",
+                               "${BUILT_PRODUCTS_DIR}/derived_src/generator.rpt",
+                               "$(BUILT_PRODUCTS_DIR)/derived_src/transition.gen",

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "TARGET=${BUILT_PRODUCTS_DIR}/derived_src\nCONFIG=${PROJECT_DIR}/OSX/libsecurity_cssm/lib/generator.cfg\n\nmkdir -p ${TARGET}\n/usr/bin/perl ${PROJECT_DIR}/OSX/libsecurity_cssm/lib/generator.pl ${SRCROOT}/OSX/libsecurity_cssm/lib/ ${CONFIG} ${TARGET}";
+                       shellScript = "TARGET=${BUILT_PRODUCTS_DIR}/derived_src\nCONFIG=${PROJECT_DIR}/OSX/libsecurity_cssm/lib/generator.cfg\n\nmkdir -p ${TARGET}\n/usr/bin/perl ${PROJECT_DIR}/OSX/libsecurity_cssm/lib/generator.pl ${SRCROOT}/OSX/libsecurity_cssm/lib/ ${CONFIG} ${TARGET}\n";

                };
                DC7162D61EB4157D000D2BB5 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC7162D61EB4157D000D2BB5 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28122,39 +32963,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
-               };
-               DC71D9FE1D95BB5B0065FB93 /* Why is this here? */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(SRCROOT)/OSX/libsecurity_asn1/lib/SecAsn1Coder.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 install libASN1 (as needed per platform).\n\n# If you make changes to this target, please make them to ASN1_not_installed as well.";
-                       showEnvVarsInLog = 0;
-               };
-               DC71D9FF1D95BCDF0065FB93 /* Why is this here? */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 8;
-                       files = (
-                       );
-                       inputPaths = (
-                               "$(SRCROOT)/OSX/libsecurity_asn1/lib/SecAsn1Coder.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 ASN1 as well.";
-                       showEnvVarsInLog = 0;
+                       shellScript = "CKKSTESTS_DIR=${SRCROOT}/keychain/ckks/tests\npython ${CKKSTESTS_DIR}/gen_test_plist.py ${CKKSTESTS_DIR} ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/KeychainCKKS.plist\n\n[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                };
                DC82FFE61D90D3F60085674B /* security_utilities DTrace */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC82FFE61D90D3F60085674B /* security_utilities DTrace */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28170,7 +32979,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/derived_src/security_utilities/\n\n/usr/sbin/dtrace -h -C -s ${PROJECT_DIR}/OSX/libsecurity_utilities/lib/security_utilities.d -o ${BUILT_PRODUCTS_DIR}/derived_src/security_utilities/utilities_dtrace.h";
+                       shellScript = "set -e\n\nmkdir -p ${BUILT_PRODUCTS_DIR}/derived_src/security_utilities/\n\nxcrun usdtheadergen -C -s \"${PROJECT_DIR}/OSX/libsecurity_utilities/lib/security_utilities.d\" -o \"${BUILT_PRODUCTS_DIR}/derived_src/security_utilities/utilities_dtrace.h\"\n";

                };
                DC82FFED1D90D4D20085674B /* ocspd mig */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DC82FFED1D90D4D20085674B /* ocspd mig */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28183,7 +32992,7 @@
                        name = "ocspd mig";
                        outputPaths = (
                                $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd_server.cpp,
                        name = "ocspd mig";
                        outputPaths = (
                                $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd_server.cpp,

-                               $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd_server.cpp,
+                               $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd_client.cpp,

                                $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd.h,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                $BUILT_PRODUCTS_DIR/derived_src/security_ocspd/ocspd.h,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -28221,7 +33030,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;

-                       shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/cstemp\n/usr/sbin/dtrace -h -C -s $PROJECT_DIR/OSX/libsecurity_codesigning/lib/security_codesigning.d -o ${BUILT_PRODUCTS_DIR}/cstemp/codesigning_dtrace.h\n";
+                       shellScript = "set -e\nmkdir -p ${BUILT_PRODUCTS_DIR}/cstemp\nxcrun usdtheadergen -C -s \"${PROJECT_DIR}/OSX/libsecurity_codesigning/lib/security_codesigning.d\" -o \"${BUILT_PRODUCTS_DIR}/cstemp/codesigning_dtrace.h\"\n";

                };
                DCD0675C1D8CDD6D007602F1 /* Make SystemPolicy */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                DCD0675C1D8CDD6D007602F1 /* Make SystemPolicy */ = {
                        isa = PBXShellScriptBuildPhase;


@@ -28275,23 +33084,25 @@
                        shellPath = /bin/sh;
                        shellScript = "antlr=$SRCROOT/OSX/libsecurity_codesigning/antlr2/antlr.jar\nDEBUG=\"\"\nmkdir -p $SRCROOT/OSX/libsecurity_codesigning/lib\nrm -f $SRCROOT/OSX/libsecurity_codesigning/lib/Requirement{Parser,Lexer}*\njava -cp \"$antlr\" antlr.Tool -o $SRCROOT/OSX/libsecurity_codesigning/lib $DEBUG requirements.grammar\nsed -n 's/^.*=\\(\".*\"\\)=.*$/        \\1,/p' $SRCROOT/OSX/libsecurity_codesigning/lib/RequirementParserTokenTypes.txt >$SRCROOT/OSX/libsecurity_codesigning/lib/RequirementKeywords.h\n";
                };
                        shellPath = /bin/sh;
                        shellScript = "antlr=$SRCROOT/OSX/libsecurity_codesigning/antlr2/antlr.jar\nDEBUG=\"\"\nmkdir -p $SRCROOT/OSX/libsecurity_codesigning/lib\nrm -f $SRCROOT/OSX/libsecurity_codesigning/lib/Requirement{Parser,Lexer}*\njava -cp \"$antlr\" antlr.Tool -o $SRCROOT/OSX/libsecurity_codesigning/lib $DEBUG requirements.grammar\nsed -n 's/^.*=\\(\".*\"\\)=.*$/        \\1,/p' $SRCROOT/OSX/libsecurity_codesigning/lib/RequirementParserTokenTypes.txt >$SRCROOT/OSX/libsecurity_codesigning/lib/RequirementKeywords.h\n";
                };

-               E7E0C6D11C90E87D00E69A21 /* chmod BATS Tests */ = {
+               DCEA0FF9213F1F410054A328 /* Generate BATS Plist */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );

+                       inputFileListPaths = (
+                       );

                        inputPaths = (
                        inputPaths = (

-                               "",

                        );
                        );

-                       name = "chmod BATS Tests";
+                       name = "Generate BATS Plist";
+                       outputFileListPaths = (
+                       );

                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
-                       showEnvVarsInLog = 0;
+                       shellScript = "OTTESTS_DIR=${SRCROOT}/keychain/ot/tests\npython ${OTTESTS_DIR}/gen_test_plist.py ${OTTESTS_DIR} ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/Octagon.plist\n\n[ \"$(whoami)\" == \"root\" ] || exit 0\nchown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                };
                };

-               EB108F3D1E6CE4D2003B0456 /* chmod BATS Tests */ = {
+               E7E0C6D11C90E87D00E69A21 /* chmod BATS Tests */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (


@@ -28304,22 +33115,74 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
+                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                        showEnvVarsInLog = 0;
                };
                        showEnvVarsInLog = 0;
                };

-               EBC15E801BE29A8C001C0C5B /* Chown BATS plist */ = {
+               EB15CA26223C60B9002BF362 /* ShellScript */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "# Future home of insecurityd and other darwinos-only executables\nmkdir -p ${DSTROOT}/AppleInternal/CoreOS/Security/\necho \"shut up now\" > ${DSTROOT}/AppleInternal/CoreOS/Security/Security_exectuables_darwinos_only_quiet_verifier.txt\n";
+               };
+               EB7E90F52193F91200B1FA21 /* ShellScript */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "cd ${SRCROOT}/keychain/analytics\nxcrun --sdk iphoneos protocompiler --arc --outputDir C2Metric --proto C2Metric.proto\n";
+               };
+               EBA12514225E55C200138070 /* Check for SYSTEM_FRAMEWORK_SEARCH_PATHS */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Check for SYSTEM_FRAMEWORK_SEARCH_PATHS";
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "# Don't use SYSTEM_FRAMEWORK_SEARCH_PATHS, its implicit with internal SDK, if added you warnings from system headers as they where problems in our headers\ngrep -e '^\\s*SYSTEM_FRAMEWORK_SEARCH_PATHS =' ${SRCROOT}/Security.xcodeproj/project.pbxproj >/dev/null 2>&1\ntest $? != 0\n";
+               };
+               EBC15E801BE29A8C001C0C5B /* Generate and Chown BATS plist */ = {

                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        );
                        inputPaths = (
                        );

-                       name = "Chown BATS plist";
+                       name = "Generate and Chown BATS plist";

                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        outputPaths = (
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;

-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\nchown root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist";
+                       shellScript = "${SRCROOT}/RegressionTests/PreprocessPlist.sh ${SRCROOT}/RegressionTests/Security.plist ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/Security.plist\n\n[ \"$(whoami)\" == \"root\" ] || exit 0\nchown root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";

                        showEnvVarsInLog = 0;
                };
                EBC73F4B209A0C3400AE3350 /* Install OCMock framework */ = {
                        showEnvVarsInLog = 0;
                };
                EBC73F4B209A0C3400AE3350 /* Install OCMock framework */ = {


@@ -28348,7 +33211,7 @@
                                DCCD33D21E3FF0D800AA4AD1 /* spi.c in Sources */,
                                0C0BDB32175685B000BC1A7E /* main.m in Sources */,
                                DC5F35AF1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,
                                DCCD33D21E3FF0D800AA4AD1 /* spi.c in Sources */,
                                0C0BDB32175685B000BC1A7E /* main.m in Sources */,
                                DC5F35AF1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,

-                               DC4269101E82FD9F002B7110 /* server_security_helpers.c in Sources */,
+                               DC4269101E82FD9F002B7110 /* server_security_helpers.m in Sources */,

                                DCB221591E8B08CA001598BC /* server_xpc.m in Sources */,
                                DC4269001E82038D002B7110 /* server_endpoint.m in Sources */,
                        );
                                DCB221591E8B08CA001598BC /* server_xpc.m in Sources */,
                                DC4269001E82038D002B7110 /* server_endpoint.m in Sources */,
                        );


@@ -28380,42 +33243,35 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C7756CE209A694100268D2C /* SFSignInAnalytics.m in Sources */,
+                               0C7A8BBF21714CDC00F4C480 /* OTJoiningConfiguration.m in Sources */,
+                               0C48B380202E438100A0E1AA /* CloudKitKeychainSyncingMockXCTest.m in Sources */,

                                0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */,
                                0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */,

-                               0CB9754E2023A8DD008D6B48 /* CloudKitKeychainSyncingMockXCTest.m in Sources */,

                                0C0DA5D01FE1F1F3003BD3BB /* CKKSControlProtocol.m in Sources */,
                                0C0DA5D01FE1F1F3003BD3BB /* CKKSControlProtocol.m in Sources */,

-                               0CBDF64D1FFC951200433E0D /* OTBottledPeerTLK.m in Sources */,

                                0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */,
                                0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */,

-                               0C8A034F1FDF60070042E8BE /* OTBottledPeerTests.m in Sources */,

                                6C53A44D206AB1EF000FA611 /* LocalKeychainAnalytics.m in Sources */,
                                6C53A44D206AB1EF000FA611 /* LocalKeychainAnalytics.m in Sources */,

-                               0C52C1FF20003BCA003F0733 /* OTTestsBase.m in Sources */,
-                               0C1637211FD12F1500210823 /* OTCloudStoreTests.m in Sources */,
-                               0CAEC9D81FD740CF00D1F2CA /* OTContextTests.m in Sources */,

                                0C0DA5CF1FE1F1C5003BD3BB /* OTControlProtocol.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 */,
                                DCDB296C1FD8820400B5D242 /* SFAnalytics.m in Sources */,
                                6C73F48D2006B83E003D5D63 /* SOSAnalytics.m in Sources */,

-                               0C46A57B2035019800F17112 /* OTLockStateNetworkingTests.m in Sources */,

                                DC5B391820C08B39005B09F6 /* SecFramework.c in Sources */,
                                DCDB296E1FD8821400B5D242 /* SFAnalyticsActivityTracker.m in Sources */,
                                DCDB29701FD8821800B5D242 /* SFAnalyticsMultiSampler.m in Sources */,
                                DC5B391820C08B39005B09F6 /* SecFramework.c in Sources */,
                                DCDB296E1FD8821400B5D242 /* SFAnalyticsActivityTracker.m in Sources */,
                                DCDB29701FD8821800B5D242 /* SFAnalyticsMultiSampler.m in Sources */,

+                               DC2FA71120E5770400DB7518 /* OTClique.m in Sources */,

                                DCDB29741FD8822200B5D242 /* SFAnalyticsSQLiteStore.m in Sources */,
                                0C46A5712034C6BA00F17112 /* OTControl.m in Sources */,
                                DCDB29721FD8821D00B5D242 /* SFAnalyticsSampler.m in Sources */,
                                DCDB297E1FD8849D00B5D242 /* SFObjCType.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 */,
+                               5A061197229ED6EB006AF14A /* NSDate+SFAnalytics.m in Sources */,

                                DCDB297C1FD8848A00B5D242 /* SFSQLite.m in Sources */,
                                DCDB297C1FD8848A00B5D242 /* SFSQLite.m in Sources */,

+                               A6C737BD23F37AB20009C930 /* entitlements.c 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 */,
                                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 */,
                                0C16372B1FD2067F00210823 /* server_endpoint.m in Sources */,
                                0C16372D1FD2069300210823 /* server_entitlement_helpers.c in Sources */,

-                               0C1637301FD206BC00210823 /* server_security_helpers.c in Sources */,
+                               0C1637301FD206BC00210823 /* server_security_helpers.m in Sources */,

                                0C1637271FD2065400210823 /* spi.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                0C1637271FD2065400210823 /* spi.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -28424,27 +33280,48 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C8BBF1B1FCB4EC500580909 /* OTControlProtocol.m in Sources */,
-                               0C8BBF091FCB447600580909 /* otctl.m in Sources */,
-                               4771DA2620A4C34800BA9772 /* OT.m in Sources */,
-                               0C8BBEFF1FCB446400580909 /* SecArgParse.c in Sources */,
+                               DCF4657A22011E1400BA6EEA /* EscrowRequestCLI.m in Sources */,
+                               0C84D83C1FCF448200B822E3 /* SecArgParse.c in Sources */,
+                               0C84D83B1FCF443A00B822E3 /* otctl.m in Sources */,
+                               DC26666A21CAC32700F19960 /* OTControlCLI.m in Sources */,
+                               0C84D8341FCF43AF00B822E3 /* OTControlProtocol.m in Sources */,
+                               DAEF8E5A22581A1200F7DF79 /* OTPairingClient.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               0C9AEEAE20783FBB00BF6237 /* Sources */ = {
+               0CCC220B23F357EE00E1FCD0 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C9AEEAF20783FBB00BF6237 /* SFSignInAnalyticsTests.m in Sources */,
+                               0CCC22A623F3868400E1FCD0 /* OTControl.m in Sources */,
+                               0CCC22CA23F3933000E1FCD0 /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
+                               0CCC22C023F38DA100E1FCD0 /* SecdWatchdog.m in Sources */,
+                               0CCC22B723F38BF500E1FCD0 /* CloudKitMockXCTest.m in Sources */,
+                               0CCC22BB23F38C8800E1FCD0 /* server_entitlement_helpers.c in Sources */,
+                               0CCC22C123F38DC100E1FCD0 /* server_security_helpers.m in Sources */,
+                               0CCC22C923F3932600E1FCD0 /* CloudKitKeychainSyncingTestsBase.m in Sources */,
+                               0CCC22BF23F38D8E00E1FCD0 /* server_endpoint.m in Sources */,
+                               0CCC22B823F38C0E00E1FCD0 /* MockCloudKit.m in Sources */,
+                               0CCC22BE23F38D7C00E1FCD0 /* spi.c in Sources */,
+                               0CCC22B923F38C3000E1FCD0 /* CKKSMockSOSPresentAdapter.m in Sources */,
+                               0C9A54B6250C286100FF007B /* OctagonTrustTests+Errors.m in Sources */,
+                               0CCC22A023F367D100E1FCD0 /* OctagonTrustTests-EscrowRecords.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               0CF406112072E3E3003D6A7F /* Sources */ = {
+               0CD743A223C3EC8000FA0EC5 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0C5663EC20BE2DF30035F362 /* SFSignInAnalytics.m in Sources */,
-                               0CF406522072E422003D6A7F /* SFSignInAnalyticsTests.m in Sources */,
+                               0C468FF623C7D4D5006F4582 /* OTICDPRecordSilentContext.m in Sources */,
+                               0C468FF223C7D4D5006F4582 /* OTEscrowAuthenticationInformation.m in Sources */,
+                               0C468FE423C7D487006F4582 /* OTEscrowRecordMetadata.m in Sources */,
+                               0C9F65AE23E3AD3200B1A2C5 /* OTEscrowTranslation.m in Sources */,
+                               0C468FE623C7D487006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */,
+                               0C79213D23C3F6E100193389 /* OctagonTrust.m in Sources */,
+                               0C468FF023C7D4D5006F4582 /* OTCDPRecoveryInformation.m in Sources */,
+                               0C468FE223C7D487006F4582 /* OTEscrowRecord.m in Sources */,
+                               0C468FF423C7D4D5006F4582 /* OTICDPRecordContext.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28456,6 +33333,7 @@
                                220179EA1E3BF16000EFB6F3 /* slcrep.cpp in Sources */,
                                220179E31E3BEB7100EFB6F3 /* dirscanner.cpp in Sources */,
                                A690B033208A75D1002FB775 /* notarization.cpp in Sources */,
                                220179EA1E3BF16000EFB6F3 /* slcrep.cpp in Sources */,
                                220179E31E3BEB7100EFB6F3 /* dirscanner.cpp in Sources */,
                                A690B033208A75D1002FB775 /* notarization.cpp in Sources */,

+                               1F631C5722388022005920D8 /* legacydevid.cpp in Sources */,

                                225394B81E30820900D3CD9B /* Code.cpp in Sources */,
                                225394B91E30821400D3CD9B /* bundlediskrep.cpp in Sources */,
                                225394BA1E30821E00D3CD9B /* cdbuilder.cpp in Sources */,
                                225394B81E30820900D3CD9B /* Code.cpp in Sources */,
                                225394B91E30821400D3CD9B /* bundlediskrep.cpp in Sources */,
                                225394BA1E30821E00D3CD9B /* cdbuilder.cpp in Sources */,


@@ -28478,6 +33356,7 @@
                                225394CA1E3082D500D3CD9B /* macho++.cpp in Sources */,
                                225394CB1E30831D00D3CD9B /* machorep.cpp in Sources */,
                                225394CC1E30832A00D3CD9B /* sigblob.cpp in Sources */,
                                225394CA1E3082D500D3CD9B /* macho++.cpp in Sources */,
                                225394CB1E30831D00D3CD9B /* machorep.cpp in Sources */,
                                225394CC1E30832A00D3CD9B /* sigblob.cpp in Sources */,

+                               A6C737B923F37A480009C930 /* entitlements.c in Sources */,

                                225394CD1E30833400D3CD9B /* resources.cpp in Sources */,
                                225394CE1E30833F00D3CD9B /* cfmunge.cpp in Sources */,
                                225394CF1E30835700D3CD9B /* csutilities.cpp in Sources */,
                                225394CD1E30833400D3CD9B /* resources.cpp in Sources */,
                                225394CE1E30833F00D3CD9B /* cfmunge.cpp in Sources */,
                                225394CF1E30835700D3CD9B /* csutilities.cpp in Sources */,


@@ -28487,24 +33366,38 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               3D58393021890FFB000ACA44 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               5A442FAD233C351C00918373 /* SecExperimentTests.m in Sources */,
+                               5A442FAC233C351500918373 /* SecExperiment.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                3DD1FF02201C07F30086D049 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                3DD1FF02201C07F30086D049 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               3DD2589F20478CF900F5DA78 /* STLegacyTests+session.m in Sources */,

                                3DD1FF99201FC50E0086D049 /* STLegacyTests+noconn.m in Sources */,
                                3DD1FF98201FC5080086D049 /* STLegacyTests+falsestart.m in Sources */,
                                3DD1FF96201FC4FE0086D049 /* STLegacyTests+crashes.m in Sources */,
                                3DD1FF95201FC4F70086D049 /* STLegacyTests+clientauth.m in Sources */,
                                3DD1FF92201FC4EA0086D049 /* SecureTransportTests.m in Sources */,
                                3DD1FF93201FC4EF0086D049 /* STLegacyTests.m in Sources */,
                                3DD1FF99201FC50E0086D049 /* STLegacyTests+noconn.m in Sources */,
                                3DD1FF98201FC5080086D049 /* STLegacyTests+falsestart.m in Sources */,
                                3DD1FF96201FC4FE0086D049 /* STLegacyTests+crashes.m in Sources */,
                                3DD1FF95201FC4F70086D049 /* STLegacyTests+clientauth.m in Sources */,
                                3DD1FF92201FC4EA0086D049 /* SecureTransportTests.m in Sources */,
                                3DD1FF93201FC4EF0086D049 /* STLegacyTests.m in Sources */,

+                               5A43A083225FA39C005450E4 /* SecProtocolHelperTest.m in Sources */,
+                               AADD4A2D215E83270054FC6D /* SecProtocolConfigurationTest.m in Sources */,

                                3DD1FF94201FC4F40086D049 /* STLegacyTests+ciphers.m in Sources */,
                                3DD1FF97201FC5030086D049 /* STLegacyTests+dhe.m in Sources */,
                                3DD1FF9A201FC5130086D049 /* STLegacyTests+renegotiate.m in Sources */,
                                3DD1FF94201FC4F40086D049 /* STLegacyTests+ciphers.m in Sources */,
                                3DD1FF97201FC5030086D049 /* STLegacyTests+dhe.m in Sources */,
                                3DD1FF9A201FC5130086D049 /* STLegacyTests+renegotiate.m in Sources */,

+                               AA44E0B5202E355C001EA371 /* SecProtocolTest.m in Sources */,

                                3DD1FF9B201FC5170086D049 /* STLegacyTests+sessioncache.m in Sources */,
                                3DD1FF9C201FC51B0086D049 /* STLegacyTests+sessionstate.m in Sources */,
                                3DD1FF9E201FC53A0086D049 /* STLegacyTests+split.m in Sources */,
                                3DD1FF9F201FC5410086D049 /* STLegacyTests+sslciphers.m in Sources */,
                                3DD1FFA0201FC5450086D049 /* STLegacyTests+tls12.m in Sources */,
                                3DD1FF9B201FC5170086D049 /* STLegacyTests+sessioncache.m in Sources */,
                                3DD1FF9C201FC51B0086D049 /* STLegacyTests+sessionstate.m in Sources */,
                                3DD1FF9E201FC53A0086D049 /* STLegacyTests+split.m in Sources */,
                                3DD1FF9F201FC5410086D049 /* STLegacyTests+sslciphers.m in Sources */,
                                3DD1FFA0201FC5450086D049 /* STLegacyTests+tls12.m in Sources */,

+                               3DD258AC2051F10300F5DA78 /* STLegacyTests+sni.m in Sources */,

                                3DD1FFA1201FC5660086D049 /* ssl-utils.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                3DD1FFA1201FC5660086D049 /* ssl-utils.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -28515,6 +33408,7 @@
                        files = (
                                3DD1FFB4201FDB1D0086D049 /* STLegacyTests+noconn.m in Sources */,
                                3DD1FFB5201FDB1D0086D049 /* STLegacyTests+falsestart.m in Sources */,
                        files = (
                                3DD1FFB4201FDB1D0086D049 /* STLegacyTests+noconn.m in Sources */,
                                3DD1FFB5201FDB1D0086D049 /* STLegacyTests+falsestart.m in Sources */,

+                               5A43A085225FA3A5005450E4 /* SecProtocolHelperTest.m in Sources */,

                                3DD1FFB6201FDB1D0086D049 /* STLegacyTests+crashes.m in Sources */,
                                3DD1FFB7201FDB1D0086D049 /* STLegacyTests+clientauth.m in Sources */,
                                3DD1FFB8201FDB1D0086D049 /* SecureTransportTests.m in Sources */,
                                3DD1FFB6201FDB1D0086D049 /* STLegacyTests+crashes.m in Sources */,
                                3DD1FFB7201FDB1D0086D049 /* STLegacyTests+clientauth.m in Sources */,
                                3DD1FFB8201FDB1D0086D049 /* SecureTransportTests.m in Sources */,


@@ -28522,16 +33416,35 @@
                                3DD1FFBA201FDB1D0086D049 /* STLegacyTests+ciphers.m in Sources */,
                                3DD1FFBB201FDB1D0086D049 /* STLegacyTests+dhe.m in Sources */,
                                3DD1FFBC201FDB1D0086D049 /* STLegacyTests+renegotiate.m in Sources */,
                                3DD1FFBA201FDB1D0086D049 /* STLegacyTests+ciphers.m in Sources */,
                                3DD1FFBB201FDB1D0086D049 /* STLegacyTests+dhe.m in Sources */,
                                3DD1FFBC201FDB1D0086D049 /* STLegacyTests+renegotiate.m in Sources */,

+                               5A43A08A226112DB005450E4 /* SecProtocolConfigurationTest.m in Sources */,

                                3DD1FFBD201FDB1D0086D049 /* STLegacyTests+sessioncache.m in Sources */,
                                3DD1FFBE201FDB1D0086D049 /* STLegacyTests+sessionstate.m in Sources */,
                                3DD1FFBD201FDB1D0086D049 /* STLegacyTests+sessioncache.m in Sources */,
                                3DD1FFBE201FDB1D0086D049 /* STLegacyTests+sessionstate.m in Sources */,

+                               5A43A084225FA3A5005450E4 /* SecProtocolTest.m in Sources */,

                                3DD1FFBF201FDB1D0086D049 /* STLegacyTests+split.m in Sources */,
                                3DD1FFC0201FDB1D0086D049 /* STLegacyTests+sslciphers.m in Sources */,
                                3DD1FFC1201FDB1D0086D049 /* STLegacyTests+tls12.m in Sources */,
                                3DD1FFBF201FDB1D0086D049 /* STLegacyTests+split.m in Sources */,
                                3DD1FFC0201FDB1D0086D049 /* STLegacyTests+sslciphers.m in Sources */,
                                3DD1FFC1201FDB1D0086D049 /* STLegacyTests+tls12.m in Sources */,

+                               3DD258A020478CFA00F5DA78 /* STLegacyTests+session.m in Sources */,

                                3DD1FFD1201FDC460086D049 /* STLegacyTests+clientauth41.m in Sources */,
                                3DD1FFC2201FDB1D0086D049 /* ssl-utils.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                3DD1FFD1201FDC460086D049 /* STLegacyTests+clientauth41.m in Sources */,
                                3DD1FFC2201FDB1D0086D049 /* ssl-utils.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               3E4D49B42531170600B124B3 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3E4D508F253117DD00B124B3 /* secsecstaticcodeapitest.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               3E88360924F068EF00E9F4D6 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3E88361424F0699F00E9F4D6 /* secseccodeapitest.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                438169081B4EDCBD00C54D58 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                438169081B4EDCBD00C54D58 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -28553,10 +33466,12 @@
                        buildActionMask = 2147483647;
                        files = (
                                4718AE10205B39620068EC3F /* spi.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                4718AE10205B39620068EC3F /* spi.c in Sources */,

+                               D4BD5E88228A6857001650A7 /* util.m in Sources */,

                                4718AE11205B39620068EC3F /* SecdWatchdog.m in Sources */,
                                4718AE12205B39620068EC3F /* server.c in Sources */,
                                4718AE13205B39620068EC3F /* server_entitlement_helpers.c in Sources */,
                                4718AE11205B39620068EC3F /* SecdWatchdog.m in Sources */,
                                4718AE12205B39620068EC3F /* server.c in Sources */,
                                4718AE13205B39620068EC3F /* server_entitlement_helpers.c in Sources */,

-                               4718AE14205B39620068EC3F /* server_security_helpers.c in Sources */,
+                               4718AE14205B39620068EC3F /* server_security_helpers.m in Sources */,
+                               EB8908B421F18E4A00F0DDDB /* SecItemBackupServer.c in Sources */,

                                4718AE15205B39620068EC3F /* server_xpc.m in Sources */,
                                4718AE16205B39620068EC3F /* server_endpoint.m in Sources */,
                        );
                                4718AE15205B39620068EC3F /* server_xpc.m in Sources */,
                                4718AE16205B39620068EC3F /* server_endpoint.m in Sources */,
                        );


@@ -28566,47 +33481,43 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               4718AE30205B39C40068EC3F /* OTAuthenticatedCiphertext.proto in Sources */,
-                               4718AE31205B39C40068EC3F /* OTPrivateKey.proto in Sources */,
-                               4718AE32205B39C40068EC3F /* OTBottle.proto in Sources */,
-                               4718AE33205B39C40068EC3F /* OTBottleContents.proto in Sources */,
-                               4718AE34205B39C40068EC3F /* CKKSSerializedKey.proto in Sources */,

                                4718AE35205B39C40068EC3F /* CKKSSQLDatabaseObject.m in Sources */,
                                4718AE35205B39C40068EC3F /* CKKSSQLDatabaseObject.m in Sources */,

-                               4718AE36205B39C40068EC3F /* CKKSRateLimiter.m in Sources */,
-                               4718AE37205B39C40068EC3F /* CKKSCKAccountStateTracker.m in Sources */,
+                               4718AE37205B39C40068EC3F /* CKKSAccountStateTracker.m in Sources */,

                                4718AE38205B39C40068EC3F /* SecCDKeychain.m in Sources */,
                                4718AE38205B39C40068EC3F /* SecCDKeychain.m in Sources */,

-                               4718AE39205B39C40068EC3F /* CKKSPowerCollection.m in Sources */,

                                4718AE3A205B39C40068EC3F /* CKKSGroupOperation.m in Sources */,
                                4718AE3A205B39C40068EC3F /* CKKSGroupOperation.m in Sources */,

-                               4718AE3B205B39C40068EC3F /* OTContextRecord.m in Sources */,
-                               4718AE3C205B39C40068EC3F /* OTPrivateKey+SF.m in Sources */,

                                4718AE3D205B39C40068EC3F /* CKKSManifestLeafRecord.m in Sources */,
                                4718AE3D205B39C40068EC3F /* CKKSManifestLeafRecord.m in Sources */,

+                               DC8DF6DF212F8A7D007B3FE8 /* OTSOSAdapter.m in Sources */,

                                4718AE3E205B39C40068EC3F /* CKKSItem.m in Sources */,
                                4718AE3F205B39C40068EC3F /* CKKSItemEncrypter.m in Sources */,
                                4718AE40205B39C40068EC3F /* CKKSOutgoingQueueEntry.m in Sources */,
                                4718AE42205B39C40068EC3F /* CKKSIncomingQueueEntry.m in Sources */,
                                4718AE3E205B39C40068EC3F /* CKKSItem.m in Sources */,
                                4718AE3F205B39C40068EC3F /* CKKSItemEncrypter.m in Sources */,
                                4718AE40205B39C40068EC3F /* CKKSOutgoingQueueEntry.m in Sources */,
                                4718AE42205B39C40068EC3F /* CKKSIncomingQueueEntry.m in Sources */,

-                               4718AE43205B39C40068EC3F /* OTLocalStore.m in Sources */,

                                4718AE44205B39C40068EC3F /* SFKeychainControlManager.m in Sources */,
                                4718AE44205B39C40068EC3F /* SFKeychainControlManager.m in Sources */,

-                               4718AE45205B39C40068EC3F /* OTBottledPeerSigned.m in Sources */,
+                               DC3AF52F2229E770006577E8 /* CKKSListenerCollection.m in Sources */,
+                               0C29BF2523232897003C807E /* OTDefines.m in Sources */,
+                               6C6AF17F221A07090091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */,

                                4718AE46205B39C40068EC3F /* CKKSIncomingQueueOperation.m in Sources */,
                                4718AE47205B39C40068EC3F /* CKKSOutgoingQueueOperation.m in Sources */,
                                4718AE48205B39C40068EC3F /* CKKSZoneStateEntry.m in Sources */,
                                4718AE46205B39C40068EC3F /* CKKSIncomingQueueOperation.m in Sources */,
                                4718AE47205B39C40068EC3F /* CKKSOutgoingQueueOperation.m in Sources */,
                                4718AE48205B39C40068EC3F /* CKKSZoneStateEntry.m in Sources */,

-                               4718AE49205B39C40068EC3F /* AsymKeybagBackup.m in Sources */,

                                4718AE4A205B39C40068EC3F /* RateLimiter.m in Sources */,
                                4718AE4B205B39C40068EC3F /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                4718AE4C205B39C40068EC3F /* CKKSCurrentItemPointer.m in Sources */,
                                4718AE4A205B39C40068EC3F /* RateLimiter.m in Sources */,
                                4718AE4B205B39C40068EC3F /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                4718AE4C205B39C40068EC3F /* CKKSCurrentItemPointer.m in Sources */,

+                               6C4AEF97218A12810012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */,
+                               EB0E1ACD2353A704002B6037 /* CKKSRateLimiter.m in Sources */,

                                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */,
                                4718AE4E205B39C40068EC3F /* OTManager.m in Sources */,
                                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */,
                                4718AE4E205B39C40068EC3F /* OTManager.m in Sources */,

-                               4718AE4F205B39C40068EC3F /* OTEscrowKeys.m in Sources */,

                                4718AE50205B39C40068EC3F /* CKKSCurrentKeyPointer.m in Sources */,
                                4718AE50205B39C40068EC3F /* CKKSCurrentKeyPointer.m in Sources */,

+                               DC880F69243D4CE50059806D /* CKKSLogging.m in Sources */,

                                4718AE51205B39C40068EC3F /* CKKSControlServer.m in Sources */,
                                4718AE52205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.m in Sources */,
                                4718AE53205B39C40068EC3F /* SecDbKeychainSerializedMetadata.m in Sources */,
                                4718AE51205B39C40068EC3F /* CKKSControlServer.m in Sources */,
                                4718AE52205B39C40068EC3F /* CKKSUpdateDeviceStateOperation.m in Sources */,
                                4718AE53205B39C40068EC3F /* SecDbKeychainSerializedMetadata.m in Sources */,

+                               6C880FCF21C3351500D38D66 /* SecDbBackupKeyClassSigningKey.m in Sources */,

                                4718AE54205B39C40068EC3F /* CKKSNearFutureScheduler.m in Sources */,
                                4718AE55205B39C40068EC3F /* CKKSMirrorEntry.m in Sources */,
                                4718AE56205B39C40068EC3F /* CloudKitCategories.m in Sources */,
                                4718AE57205B39C40068EC3F /* CKKSPeer.m in Sources */,
                                4718AE58205B39C40068EC3F /* CKKS.m in Sources */,
                                4718AE59205B39C40068EC3F /* CKKSSynchronizeOperation.m in Sources */,
                                4718AE54205B39C40068EC3F /* CKKSNearFutureScheduler.m in Sources */,
                                4718AE55205B39C40068EC3F /* CKKSMirrorEntry.m in Sources */,
                                4718AE56205B39C40068EC3F /* CloudKitCategories.m in Sources */,
                                4718AE57205B39C40068EC3F /* CKKSPeer.m in Sources */,
                                4718AE58205B39C40068EC3F /* CKKS.m in Sources */,
                                4718AE59205B39C40068EC3F /* CKKSSynchronizeOperation.m in Sources */,

+                               0C2F337320DD64940031A92D /* OTRamping.m in Sources */,

                                4718AE5A205B39C40068EC3F /* CKKSRecordHolder.m in Sources */,
                                4718AE5B205B39C40068EC3F /* SOSChangeTracker.c in Sources */,
                                4718AE5C205B39C40068EC3F /* CKKSScanLocalItemsOperation.m in Sources */,
                                4718AE5A205B39C40068EC3F /* CKKSRecordHolder.m in Sources */,
                                4718AE5B205B39C40068EC3F /* SOSChangeTracker.c in Sources */,
                                4718AE5C205B39C40068EC3F /* CKKSScanLocalItemsOperation.m in Sources */,


@@ -28615,6 +33526,7 @@
                                4718AE5F205B39C40068EC3F /* SOSEngine.c in Sources */,
                                4718AE60205B39C40068EC3F /* CKKSKey.m in Sources */,
                                4718AE61205B39C40068EC3F /* CKKSViewManager.m in Sources */,
                                4718AE5F205B39C40068EC3F /* SOSEngine.c in Sources */,
                                4718AE60205B39C40068EC3F /* CKKSKey.m in Sources */,
                                4718AE61205B39C40068EC3F /* CKKSViewManager.m in Sources */,

+                               6C880FD021C3351500D38D66 /* SecDbBackupMetadataClassKey.m in Sources */,

                                4718AE62205B39C40068EC3F /* SecDbKeychainItemV7.m in Sources */,
                                4718AE63205B39C40068EC3F /* OTControlProtocol.m in Sources */,
                                4718AE64205B39C40068EC3F /* CKKSReachabilityTracker.m in Sources */,
                                4718AE62205B39C40068EC3F /* SecDbKeychainItemV7.m in Sources */,
                                4718AE63205B39C40068EC3F /* OTControlProtocol.m in Sources */,
                                4718AE64205B39C40068EC3F /* CKKSReachabilityTracker.m in Sources */,


@@ -28626,50 +33538,51 @@
                                4718AE6A205B39C40068EC3F /* SecItemBackupServer.c in Sources */,
                                4718AE6B205B39C40068EC3F /* SecItemDataSource.c in Sources */,
                                4718AE6C205B39C40068EC3F /* OctagonControlServer.m in Sources */,
                                4718AE6A205B39C40068EC3F /* SecItemBackupServer.c in Sources */,
                                4718AE6B205B39C40068EC3F /* SecItemDataSource.c in Sources */,
                                4718AE6C205B39C40068EC3F /* OctagonControlServer.m in Sources */,

+                               DC5F65B12225CD720051E9FA /* CKKSProvideKeySetOperation.m in Sources */,

                                4718AE6D205B39C40068EC3F /* SecItemDb.c in Sources */,
                                4718AE6E205B39C40068EC3F /* SecItemSchema.c in Sources */,
                                4718AE6F205B39C40068EC3F /* OTConstants.m in Sources */,
                                4718AE6D205B39C40068EC3F /* SecItemDb.c in Sources */,
                                4718AE6E205B39C40068EC3F /* SecItemSchema.c in Sources */,
                                4718AE6F205B39C40068EC3F /* OTConstants.m in Sources */,

-                               4718AE70205B39C40068EC3F /* OTRamping.m in Sources */,

                                4718AE71205B39C40068EC3F /* SecItemServer.c in Sources */,
                                4718AE72205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
                                D491112D209515400066A1E4 /* CKKSAnalytics.m in Sources */,
                                4718AE71205B39C40068EC3F /* SecItemServer.c in Sources */,
                                4718AE72205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
                                D491112D209515400066A1E4 /* CKKSAnalytics.m in Sources */,

-                               4718AE74205B39C40068EC3F /* OTContext.m in Sources */,

                                4718AE75205B39C40068EC3F /* NSOperationCategories.m in Sources */,
                                4718AE76205B39C40068EC3F /* SecKeybagSupport.c in Sources */,
                                4718AE77205B39C40068EC3F /* SecLogSettingsServer.m in Sources */,
                                4718AE78205B39C40068EC3F /* CKKSDeviceStateEntry.m in Sources */,
                                4718AE79205B39C40068EC3F /* CKKSFixups.m in Sources */,
                                4718AE75205B39C40068EC3F /* NSOperationCategories.m in Sources */,
                                4718AE76205B39C40068EC3F /* SecKeybagSupport.c in Sources */,
                                4718AE77205B39C40068EC3F /* SecLogSettingsServer.m in Sources */,
                                4718AE78205B39C40068EC3F /* CKKSDeviceStateEntry.m in Sources */,
                                4718AE79205B39C40068EC3F /* CKKSFixups.m in Sources */,

-                               4718AE7A205B39C40068EC3F /* OTIdentity.m in Sources */,

                                4718AE7C205B39C40068EC3F /* SecOTRRemote.m in Sources */,
                                4718AE7D205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                4718AE7E205B39C40068EC3F /* CKKSNewTLKOperation.m in Sources */,
                                4718AE7F205B39C40068EC3F /* CKKSLockStateTracker.m in Sources */,
                                4718AE7C205B39C40068EC3F /* SecOTRRemote.m in Sources */,
                                4718AE7D205B39C40068EC3F /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                4718AE7E205B39C40068EC3F /* CKKSNewTLKOperation.m in Sources */,
                                4718AE7F205B39C40068EC3F /* CKKSLockStateTracker.m in Sources */,

-                               4718AE80205B39C40068EC3F /* OTCloudStoreState.m in Sources */,
+                               6C9791C821C20CFF0074C609 /* NSError+UsefulConstructors.m in Sources */,
+                               6C4AEFA1218A189B0012C5DA /* SecAKSObjCWrappers.m in Sources */,
+                               6C4AEF89218A09E80012C5DA /* CheckV12DevEnabled.m in Sources */,

                                4718AE81205B39C40068EC3F /* SecDbKeychainSerializedSecretData.m in Sources */,
                                4718AE82205B39C40068EC3F /* CKKSKeychainView.m in Sources */,
                                4718AE81205B39C40068EC3F /* SecDbKeychainSerializedSecretData.m in Sources */,
                                4718AE82205B39C40068EC3F /* CKKSKeychainView.m in Sources */,

+                               FC637231237B5D2200973738 /* SecItemServer+SWC.m in Sources */,

                                4718AE83205B39C40068EC3F /* SecuritydXPC.c in Sources */,
                                4718AE84205B39C40068EC3F /* SecDbKeychainSerializedItemV7.m in Sources */,
                                4718AE83205B39C40068EC3F /* SecuritydXPC.c in Sources */,
                                4718AE84205B39C40068EC3F /* SecDbKeychainSerializedItemV7.m in Sources */,

-                               4718AE85205B39C40068EC3F /* OT.m in Sources */,

                                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */,
                                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */,

-                               4718AE87205B39C40068EC3F /* CKKSTLKShare.m in Sources */,
+                               4718AE87205B39C40068EC3F /* CKKSTLKShareRecord.m in Sources */,
+                               DC0BD4F621BB0610006B9154 /* CKKSKeychainBackedKey.m in Sources */,

                                4718AE88205B39C40068EC3F /* CKKSHealTLKSharesOperation.m in Sources */,
                                4718AE89205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.m in Sources */,
                                4718AE8A205B39C40068EC3F /* SecBackupKeybagEntry.m in Sources */,
                                4718AE8B205B39C40068EC3F /* iCloudTrace.c in Sources */,
                                4718AE88205B39C40068EC3F /* CKKSHealTLKSharesOperation.m in Sources */,
                                4718AE89205B39C40068EC3F /* CKKSReencryptOutgoingItemsOperation.m in Sources */,
                                4718AE8A205B39C40068EC3F /* SecBackupKeybagEntry.m in Sources */,
                                4718AE8B205B39C40068EC3F /* iCloudTrace.c in Sources */,

-                               4718AE8C205B39C40068EC3F /* CKKSAPSReceiver.m in Sources */,
-                               4718AE8D205B39C40068EC3F /* OTBottledPeer.m in Sources */,
+                               4718AE8C205B39C40068EC3F /* OctagonAPSReceiver.m in Sources */,
+                               DC391F9F21BF2F8700772585 /* CKKSConstants.m in Sources */,
+                               6C880FCD21C3351500D38D66 /* SecDbBackupBag.m in Sources */,

                                4718AE8F205B39C40068EC3F /* SOSEnsureBackup.m in Sources */,
                                4718AE8F205B39C40068EC3F /* SOSEnsureBackup.m in Sources */,

-                               4718AE90205B39C40068EC3F /* OTBottledPeerRecord.m in Sources */,
-                               4718AE91205B39C40068EC3F /* OTCloudStore.m in Sources */,
+                               6C880FD121C3351500D38D66 /* SecDbBackupRecoverySet.m in Sources */,
+                               6C880FCE21C3351500D38D66 /* SecDbBackupBagIdentity.m in Sources */,

                                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */,
                                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */,

-                               4718AE93205B39C40068EC3F /* OTPreflightInfo.m in Sources */,
-                               4718AE95205B39C40068EC3F /* OTAuthenticatedCiphertext+SF.m in Sources */,

                                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */,
                                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */,
                                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */,
                                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */,

-                               4718AE98205B39C40068EC3F /* CKKSZone.m in Sources */,
+                               EB0E1ACE2353A704002B6037 /* CKKSPBFileStorage.m in Sources */,

                                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */,
                                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */,

-                               4718AE9A205B39C40068EC3F /* SFECPublicKey+SPKI.m in Sources */,

                                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */,
                                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */,

+                               DC5A01EB21BB428500D87AB9 /* CKKSTLKShare.m in Sources */,
+                               6C4AEF91218A0C190012C5DA /* SecDbBackupManager.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28678,16 +33591,20 @@
                        buildActionMask = 2147483647;
                        files = (
                                47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                47DE88DA1FA7B07400DD3254 /* server_xpc.m in Sources */,

-                               4727FBEF1F9924FB0003AE36 /* server_security_helpers.c in Sources */,
+                               4727FBEF1F9924FB0003AE36 /* server_security_helpers.m in Sources */,

                                4727FBEE1F9924DA0003AE36 /* server_entitlement_helpers.c in Sources */,
                                477A1FED2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
                                4727FBEB1F99227F0003AE36 /* spi.c in Sources */,
                                4727FBEC1F99235B0003AE36 /* SecdWatchdog.m in Sources */,
                                4727FBEE1F9924DA0003AE36 /* server_entitlement_helpers.c in Sources */,
                                477A1FED2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
                                4727FBEB1F99227F0003AE36 /* spi.c in Sources */,
                                4727FBEC1F99235B0003AE36 /* SecdWatchdog.m in Sources */,

+                               6CD8412C23F5D871003DDF34 /* KeychainBackupTests.m in Sources */,

                                4764E9272059D866005497C9 /* KeychainModel.xcdatamodeld in Sources */,
                                4764E9272059D866005497C9 /* KeychainModel.xcdatamodeld in Sources */,

+                               6C6B3ADF23F1B3E0002827C2 /* KeychainAppClipTests.m in Sources */,

                                4727FBBA1F9918590003AE36 /* KeychainCryptoTests.m in Sources */,
                                4727FBBA1F9918590003AE36 /* KeychainCryptoTests.m in Sources */,

+                               6C9791C921C2EAB60074C609 /* NSError+UsefulConstructors.m in Sources */,
+                               6C912AA1227A3E9700671FC6 /* CheckV12DevEnabled.m in Sources */,

                                477A1FE4203763A500ACD81D /* KeychainAPITests.m in Sources */,
                                4727FBED1F99249A0003AE36 /* server_endpoint.m in Sources */,
                                477A1FE4203763A500ACD81D /* KeychainAPITests.m in Sources */,
                                4727FBED1F99249A0003AE36 /* server_endpoint.m in Sources */,

-                               096C647020AB1BC700D7B7D5 /* KeychainEntitlementsTest.m in Sources */,
+                               6C6B3AC623F1A820002827C2 /* KeychainEntitlementsTest.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28712,29 +33629,10 @@
                        buildActionMask = 2147483647;
                        files = (
                                47D13759209CD1A200CAD493 /* NSError+UsefulConstructors.m in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                47D13759209CD1A200CAD493 /* NSError+UsefulConstructors.m in Sources */,

-                               4771DA2520A4C33A00BA9772 /* OT.m in Sources */,

                                4771D980209A75FE00BA9772 /* KeychainDataclassOwner.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                4771D980209A75FE00BA9772 /* KeychainDataclassOwner.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               478D42751FD72A8100CAB645 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               478D42761FD72A8100CAB645 /* server_xpc.m in Sources */,
-                               4764E92D2059D8BF005497C9 /* KeychainModel.xcdatamodeld in Sources */,
-                               478D42771FD72A8100CAB645 /* server_security_helpers.c in Sources */,
-                               478D42781FD72A8100CAB645 /* server_entitlement_helpers.c in Sources */,
-                               477A1FEE2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
-                               09BFE35C20A32E0E008511E9 /* KeychainEntitlementsTest.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;
-               };

                47C2F17F2059CB680062DE30 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                47C2F17F2059CB680062DE30 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -28747,7 +33645,8 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               47C51B871EEA657D0032D9E5 /* SecurityUnitTests.m in Sources */,
+                               EB9795B522FE9256002BDBFB /* SecItemTests.m in Sources */,
+                               47C51B871EEA657D0032D9E5 /* SecKeyTests.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28757,34 +33656,42 @@
                        files = (
                                6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */,
                        files = (
                                6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */,

-                               D46246A61F9AE61000D63882 /* oids.c in Sources */,
-                               0CBFEACB200FCD2D009A60E9 /* SFSignInAnalytics.m in Sources */,
-                               0CBD55B31FE883F200A8CE21 /* SFBehavior.m in Sources */,
+                               5A06118E229ED5EB006AF14A /* NSDate+SFAnalytics.m in Sources */,
+                               0C8884012154C4E80053224D /* OTJoiningConfiguration.m in Sources */,

                                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */,
                                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */,
                                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */,
                                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */,

+                               5A442FA9233C351000918373 /* SecExperiment.m in Sources */,

                                DC926F091F33FA8D0012A315 /* CKKSControlProtocol.m in Sources */,
                                4723C9CC1F152ED30082882F /* SFSQLiteStatement.m in Sources */,
                                DC926F091F33FA8D0012A315 /* CKKSControlProtocol.m in Sources */,
                                4723C9CC1F152ED30082882F /* SFSQLiteStatement.m in Sources */,

+                               0CD9E34523592EA6002995DE /* OctagonSignPosts.m in Sources */,

                                DCC5860020BF8A7E005C7269 /* SecFramework.c in Sources */,
                                DCA85B931E8D97E400BA7241 /* client.c in Sources */,
                                DCC5860020BF8A7E005C7269 /* SecFramework.c in Sources */,
                                DCA85B931E8D97E400BA7241 /* client.c in Sources */,

+                               DCA9D84621FFE7CF00B27421 /* EscrowRequestXPCProtocol.m in Sources */,

                                6CBF653A1FA147E500A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                DC9C95BF1F79DC88000D19E5 /* CKKSControl.m 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 */,
                                EB10A3E620356E2000E84270 /* OTConstants.m in Sources */,
                                18F7F67914D77F4400F88A12 /* NtlmGenerator.c in Sources */,
                                0CD8CB051ECA50780076F37F /* SOSPeerOTRTimer.m in Sources */,
                                DCA85B981E8D980A00BA7241 /* client_endpoint.m in Sources */,

+                               0C84D8371FCF43BF00B822E3 /* OTControlProtocol.m in Sources */,

                                6CE3654E1FA100E50012F6AB /* SFAnalytics.m in Sources */,
                                6CE3654E1FA100E50012F6AB /* SFAnalytics.m in Sources */,

+                               0C0E60DA20D033E400E654F2 /* OTControl.m in Sources */,

                                18F7F67A14D77F4400F88A12 /* ntlmBlobPriv.c in Sources */,
                                18F7F67A14D77F4400F88A12 /* ntlmBlobPriv.c in Sources */,

+                               DC2B757721F2A272003C9356 /* SecEscrowRequest.m in Sources */,
+                               5AF593FF1FA0EE5300A5C1EC /* SecProtocol.c in Sources */,
+                               5A7E037822272C2D003DB3A0 /* SecProtocolHelper.m in Sources */,

                                6CAA8CFC1F83E7EA007B6E03 /* SFObjCType.m in Sources */,
                                E7B00700170B581D00B27966 /* Security.exp-in in Sources */,
                                6CAA8CFC1F83E7EA007B6E03 /* SFObjCType.m in Sources */,
                                E7B00700170B581D00B27966 /* Security.exp-in in Sources */,

-                               0C8BBF121FCB4AAB00580909 /* OTControl.m in Sources */,
-                               EB48C1A51E573EE400EC5E57 /* whoami.m in Sources */,

                                B61F67571F1FCFCB00E2FDBB /* SecPaddingConfigurations.c in Sources */,
                                B61F67571F1FCFCB00E2FDBB /* SecPaddingConfigurations.c in Sources */,

-                               AA44E0D72032515C001EA371 /* SecProtocolTypes.m in Sources */,
+                               78ADC62B1FA0FACD001EB8B6 /* SecProtocolTypes.m in Sources */,
+                               DC372C8C22B4501900AB9F41 /* SecCoreAnalytics.m in Sources */,

                                6CE365531FA101080012F6AB /* SFAnalyticsSampler.m in Sources */,
                                6CE365531FA101080012F6AB /* SFAnalyticsSampler.m in Sources */,

-                               AA44E0D520325150001EA371 /* SecProtocol.c in Sources */,
+                               AA9FD59C2152AFD70045A07A /* SecProtocolConfiguration.m in Sources */,

                                6C73F48A2006B839003D5D63 /* SOSAnalytics.m in Sources */,
                                6C73F48A2006B839003D5D63 /* SOSAnalytics.m in Sources */,

+                               EB973652234E8F4B00518B2B /* CKKSPBFileStorage.m in Sources */,
+                               5A04BAFA22976A15001848A0 /* OTClique.m in Sources */,

                                6CE365571FA1017D0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */,
                                6CE365571FA1017D0012F6AB /* SFAnalyticsSQLiteStore.m in Sources */,

+                               EB9B285721C77C8D00173DC2 /* OTDefines.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28810,7 +33717,7 @@
                                0C78F1CD16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */,
                                DCB221531E8B08BC001598BC /* server_xpc.m in Sources */,
                                DCCD33D01E3FEF2A00AA4AD1 /* spi.c in Sources */,
                                0C78F1CD16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */,
                                DCB221531E8B08BC001598BC /* server_xpc.m in Sources */,
                                DCCD33D01E3FEF2A00AA4AD1 /* spi.c in Sources */,

-                               DC42690C1E82FD9A002B7110 /* server_security_helpers.c in Sources */,
+                               DC42690C1E82FD9A002B7110 /* server_security_helpers.m in Sources */,

                                DC5F35AA1EE0F27100900966 /* server_entitlement_helpers.c in Sources */,
                                0C78F1CF16A5E1BF00654E08 /* sectask_ipc.defs in Sources */,
                        );
                                DC5F35AA1EE0F27100900966 /* server_entitlement_helpers.c in Sources */,
                                0C78F1CF16A5E1BF00654E08 /* sectask_ipc.defs in Sources */,
                        );


@@ -28830,8 +33737,34 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               1BDEBEFD2253E6D9009AD3D6 /* policy_dryrun.m in Sources */,
+                               DC8506A72097EE7500C712EC /* SecurityTool.c in Sources */,
+                               DC3AA28E2097E24C007CA68A /* scep.c in Sources */,
+                               DC3AA2922097E25C007CA68A /* trust_update.m in Sources */,
+                               DC85069D2097E69500C712EC /* keychain_backup.c in Sources */,
+                               DC8506B42097F1FC00C712EC /* whoami.m in Sources */,
+                               DC8506AA2097EEA500C712EC /* syncbubble.m in Sources */,
+                               DC8506A82097EE8E00C712EC /* KeychainCheck.m in Sources */,
+                               DC3AA2842097E21D007CA68A /* log_control.c in Sources */,
+                               DC3AA27B2097DF85007CA68A /* not_on_this_platorm.c in Sources */,
+                               DC3AA27F2097E20A007CA68A /* keychain_util.c in Sources */,

                                E7104A0C169E171900DB0045 /* security_tool_commands.c in Sources */,
                                E7104A0C169E171900DB0045 /* security_tool_commands.c in Sources */,

+                               DC3AA2862097E22A007CA68A /* codesign.c in Sources */,
+                               DC8506AC2097EEBA00C712EC /* sos.m in Sources */,

                                E78A9ADA1D34959200006B5B /* NSFileHandle+Formatting.m in Sources */,
                                E78A9ADA1D34959200006B5B /* NSFileHandle+Formatting.m in Sources */,

+                               BE57B1192509E1000045B7FD /* ca_revocation_additions.m in Sources */,
+                               DC3AA28A2097E23B007CA68A /* keychain_find.m in Sources */,
+                               DC3AA2782097DF70007CA68A /* readline.c in Sources */,
+                               DC3AA2812097E216007CA68A /* add_internet_password.c in Sources */,
+                               DC8506B22097F1DF00C712EC /* digest_calc.c in Sources */,
+                               DC8506AE2097EEDA00C712EC /* leaks.c in Sources */,
+                               DC3AA28F2097E253007CA68A /* show_certificates.c in Sources */,
+                               DC3AA2942097E264007CA68A /* spc.c in Sources */,
+                               DC3AA27D2097E206007CA68A /* verify_cert.c in Sources */,
+                               D4A3A597217A85D500F0A8DA /* ct_exceptions.m in Sources */,
+                               DC3AA2872097E231007CA68A /* keychain_add.c in Sources */,
+                               DC3AA28B2097E23F007CA68A /* pkcs12_util.c in Sources */,
+                               DC8506B02097EEF200C712EC /* print_cert.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28864,11 +33797,18 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               4771DA2720A4C37D00BA9772 /* OT.m in Sources */,

                                5346481E173322BD00FE9172 /* KeychainSyncAccountNotification.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                5346481E173322BD00FE9172 /* KeychainSyncAccountNotification.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               5A442F82233C330F00918373 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               5A442FAE233C352200918373 /* experimentTool.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                5E10992119A5E55800A60E2B /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                5E10992119A5E55800A60E2B /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -28886,7 +33826,7 @@
                                DCA85B971E8D980200BA7241 /* client.c in Sources */,
                                DCCD33E91E3FFDBF00AA4AD1 /* spi.c in Sources */,
                                DCA85B9B1E8D981200BA7241 /* client_endpoint.m in Sources */,
                                DCA85B971E8D980200BA7241 /* client.c in Sources */,
                                DCCD33E91E3FFDBF00AA4AD1 /* spi.c in Sources */,
                                DCA85B9B1E8D981200BA7241 /* client_endpoint.m in Sources */,

-                               DC4269111E82FDA0002B7110 /* server_security_helpers.c in Sources */,
+                               DC4269111E82FDA0002B7110 /* server_security_helpers.m in Sources */,

                                DC5F35AE1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,
                                5EBE247D1B00CCAE0007DB0E /* main.c in Sources */,
                                5E4E05A41B0CA0FD001C4A31 /* sec_acl_stress.c in Sources */,
                                DC5F35AE1EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,
                                5EBE247D1B00CCAE0007DB0E /* main.c in Sources */,
                                5E4E05A41B0CA0FD001C4A31 /* sec_acl_stress.c in Sources */,


@@ -28894,6 +33834,39 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               6C2045E62424BA7E00F9461D /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6C2045F12424BAC900F9461D /* main.m in Sources */,
+                               6C2045F22424BACE00F9461D /* KeychainStasher.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C39234D21F13E4D00D018AD /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6CD224E623949132001B70FD /* SecDbBackupTestsBase.m in Sources */,
+                               6C912AA0227A3E9600671FC6 /* CheckV12DevEnabled.m in Sources */,
+                               6C39237B21F13EB400D018AD /* SecDbBackupManager.m in Sources */,
+                               6C39237C21F13EB400D018AD /* SecDbBackupBag.m in Sources */,
+                               6C39237D21F13EB400D018AD /* SecDbBackupBagIdentity.m in Sources */,
+                               6C39237F21F13EB400D018AD /* SecDbBackupKeyClassSigningKey.m in Sources */,
+                               6C39238121F13EB400D018AD /* SecDbBackupMetadataClassKey.m in Sources */,
+                               6C02134E21F7ED25009D5C80 /* SecDbBackupTests.m in Sources */,
+                               6C39238221F13EB400D018AD /* SecDbBackupRecoverySet.m in Sources */,
+                               6C39234E21F13E4D00D018AD /* server_xpc.m in Sources */,
+                               6C39234F21F13E4D00D018AD /* server_security_helpers.m in Sources */,
+                               6C39235021F13E4D00D018AD /* server_entitlement_helpers.c in Sources */,
+                               6C39235221F13E4D00D018AD /* spi.c in Sources */,
+                               6C39235321F13E4D00D018AD /* SecdWatchdog.m in Sources */,
+                               6C39235421F13E4D00D018AD /* KeychainModel.xcdatamodeld in Sources */,
+                               6C39235621F13E4D00D018AD /* NSError+UsefulConstructors.m in Sources */,
+                               6C39235821F13E4D00D018AD /* server_endpoint.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                6C46057A1F882B9B001421B6 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                6C46057A1F882B9B001421B6 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -28901,66 +33874,58 @@
                                6CB96BB21F966DA400E11457 /* SFSQLite.m in Sources */,
                                6CB96BB31F966DA400E11457 /* SFSQLiteStatement.m in Sources */,
                                6CBF65421FA2255800A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                6CB96BB21F966DA400E11457 /* SFSQLite.m in Sources */,
                                6CB96BB31F966DA400E11457 /* SFSQLiteStatement.m in Sources */,
                                6CBF65421FA2255800A68667 /* SFAnalyticsActivityTracker.m in Sources */,

+                               EB09310D213F980800C0A495 /* TestResourceUsage.m in Sources */,

                                6CDF8DF21F9649AB00140B54 /* SFAnalyticsSampler.m in Sources */,
                                6CDF8DF41F9649C000140B54 /* SFAnalytics.m in Sources */,
                                6C4605BC1F882DB6001421B6 /* SFAnalyticsTests.m in Sources */,
                                6CDF8DF21F9649AB00140B54 /* SFAnalyticsSampler.m in Sources */,
                                6CDF8DF41F9649C000140B54 /* SFAnalytics.m in Sources */,
                                6C4605BC1F882DB6001421B6 /* SFAnalyticsTests.m in Sources */,

+                               5A0F84A522AEAF5B0097AEEA /* NSDate+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 */,
                                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 */,

+                               5A061194229ED6E7006AF14A /* NSDate+SFAnalytics.m in Sources */,

                                6CDF8DF31F9649C000140B54 /* SFAnalyticsSQLiteStore.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                6CDF8DF31F9649C000140B54 /* SFAnalyticsSQLiteStore.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6C98083D1E788AEB00E70590 /* Sources */ = {
+               6C7BE2B623C3DD64003BB2CA /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               6CBF65431FA2257100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
-                               6CAA8CF71F83E79E007B6E03 /* SFSQLite.m in Sources */,
-                               476541A41F33EDED00413F65 /* SecdWatchdog.m in Sources */,
-                               47B011991F17D78D0030B49F /* SFSQLiteStatement.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;
-               };
-               6C9808791E788AFD00E70590 /* Sources */ = {
+                               6C7BE2B823C3DD64003BB2CA /* SecurityTool.c in Sources */,
+                               6C7BE2B923C3DD64003BB2CA /* scep.c in Sources */,
+                               6C7BE2BA23C3DD64003BB2CA /* trust_update.m in Sources */,
+                               6C7BE2BB23C3DD64003BB2CA /* keychain_backup.c in Sources */,
+                               6C7BE2BC23C3DD64003BB2CA /* whoami.m in Sources */,
+                               6C7BE2BE23C3DD64003BB2CA /* KeychainCheck.m in Sources */,
+                               6C7BE2BF23C3DD64003BB2CA /* log_control.c in Sources */,
+                               6C7BE2C023C3DD64003BB2CA /* not_on_this_platorm.c in Sources */,
+                               6C7BE2C123C3DD64003BB2CA /* keychain_util.c in Sources */,
+                               6C7BE2C223C3DD64003BB2CA /* security_tool_commands.c in Sources */,
+                               6C7BE2C323C3DD64003BB2CA /* codesign.c in Sources */,
+                               6C7BE2C523C3DD64003BB2CA /* NSFileHandle+Formatting.m in Sources */,
+                               6C7BE2C623C3DD64003BB2CA /* keychain_find.m in Sources */,
+                               6C7BE2C723C3DD64003BB2CA /* readline.c in Sources */,
+                               6C7BE2C823C3DD64003BB2CA /* add_internet_password.c in Sources */,
+                               6C7BE2C923C3DD64003BB2CA /* digest_calc.c in Sources */,
+                               6C7BE2CA23C3DD64003BB2CA /* leaks.c in Sources */,
+                               6C7BE2CB23C3DD64003BB2CA /* show_certificates.c in Sources */,
+                               6C7BE2CC23C3DD64003BB2CA /* spc.c in Sources */,
+                               6C7BE2CD23C3DD64003BB2CA /* verify_cert.c in Sources */,
+                               6C7BE2CE23C3DD64003BB2CA /* ct_exceptions.m in Sources */,
+                               BE57B1182509E1000045B7FD /* ca_revocation_additions.m in Sources */,
+                               6C7BE2CF23C3DD64003BB2CA /* keychain_add.c in Sources */,
+                               6C7BE2D023C3DD64003BB2CA /* pkcs12_util.c in Sources */,
+                               6C7BE2D123C3DD64003BB2CA /* print_cert.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               6C96327D242A279B00C53CE2 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               6CAA8CF61F83E79D007B6E03 /* SFSQLite.m in Sources */,
-                               6CDB5FF81FA78D2300410924 /* SFAnalyticsMultiSampler.m in Sources */,
-                               476541A51F33EE1E00413F65 /* SecdWatchdog.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 */,
+                               6C963284242A279B00C53CE2 /* main.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -28995,32 +33960,24 @@
                        buildActionMask = 2147483647;
                        files = (
                                D49111322095154B0066A1E4 /* Assets.xcassets in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                D49111322095154B0066A1E4 /* Assets.xcassets in Sources */,

-                               D49111312095154B0066A1E4 /* Main.storyboard in Sources */,

                                6CF4A0BE1E45488B00ECD7B5 /* ViewController.m in Sources */,
                                6CF4A0BB1E45488B00ECD7B5 /* main.m in Sources */,
                                6CF4A0B81E45488B00ECD7B5 /* AppDelegate.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                6CF4A0BE1E45488B00ECD7B5 /* ViewController.m in Sources */,
                                6CF4A0BB1E45488B00ECD7B5 /* main.m in Sources */,
                                6CF4A0B81E45488B00ECD7B5 /* AppDelegate.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               6CF4A0DC1E4549F200ECD7B5 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               6CF4A0EA1E4549F300ECD7B5 /* ViewController.m in Sources */,
-                               6CF4A0E71E4549F300ECD7B5 /* AppDelegate.m in Sources */,
-                               6CF4A0E41E4549F200ECD7B5 /* main.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };

                790851B30CA9859F0083CC4D /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                790851B30CA9859F0083CC4D /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               D4A55E70226A50E900FCC664 /* PolicyReporter.h in Sources */,
+                               D4A55E71226A50E900FCC664 /* PolicyReporter.m in Sources */,

                                DCCD33CF1E3FEF1800AA4AD1 /* spi.c in Sources */,
                                476541711F33B59500413F65 /* SecdWatchdog.m in Sources */,
                                790851D40CA9B19D0083CC4D /* server.c in Sources */,
                                DCCD33CF1E3FEF1800AA4AD1 /* spi.c in Sources */,
                                476541711F33B59500413F65 /* SecdWatchdog.m in Sources */,
                                790851D40CA9B19D0083CC4D /* server.c in Sources */,

+                               D4BD5E86228A6855001650A7 /* util.m in Sources */,

                                DC5F35A71EE0F25100900966 /* server_entitlement_helpers.c in Sources */,
                                DC5F35A71EE0F25100900966 /* server_entitlement_helpers.c in Sources */,

-                               DC4269091E82FD8C002B7110 /* server_security_helpers.c in Sources */,
+                               DC4269091E82FD8C002B7110 /* server_security_helpers.m in Sources */,

                                DCB221511E8B08A6001598BC /* server_xpc.m in Sources */,
                                DC6ACC471E81E08E00125DC5 /* server_endpoint.m in Sources */,
                        );
                                DCB221511E8B08A6001598BC /* server_xpc.m in Sources */,
                                DC6ACC471E81E08E00125DC5 /* server_endpoint.m in Sources */,
                        );


@@ -29033,6 +33990,7 @@
                                7913B2020D172B3900601FE9 /* ioSock.c in Sources */,
                                7913B2030D172B3900601FE9 /* sslAppUtils.cpp in Sources */,
                                7913B2050D172B3900601FE9 /* sslServer.cpp in Sources */,
                                7913B2020D172B3900601FE9 /* ioSock.c in Sources */,
                                7913B2030D172B3900601FE9 /* sslAppUtils.cpp in Sources */,
                                7913B2050D172B3900601FE9 /* sslServer.cpp in Sources */,

+                               DCC51C99209B7C1500A40387 /* print_cert.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29062,6 +34020,66 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               BEAA0027202A832500E51F45 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C468FF823C7D4E3006F4582 /* OTEscrowRecordMetadata.m in Sources */,
+                               0CE15E2F222DF63600B7EAA5 /* SetValueTransformer.swift in Sources */,
+                               0CE15E2C222DF63600B7EAA4 /* RecoveryKey.swift in Sources */,
+                               0CE15E43222DF6A800B7EAA4 /* Recovery.m in Sources */,
+                               BE92249E204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld in Sources */,
+                               BE9F8D12206C121400B53D16 /* Decrypter.swift in Sources */,
+                               DC391F8D21BF244000772585 /* CKKSSIV.m in Sources */,
+                               0CE15E30222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */,
+                               0C3BB3582188E18C0018FC14 /* OTPrivateKey+SF.m in Sources */,
+                               0C468FF723C7D4E3006F4582 /* OTEscrowRecord.m in Sources */,
+                               BECFA43D20F9493000B11002 /* Policy.swift in Sources */,
+                               0CB582D1218920090040C5F2 /* OTAuthenticatedCiphertext.m in Sources */,
+                               0CF70BD9218BED1000EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */,
+                               DC754C742228B59000A39C8E /* TrustedPeersHelperProtocol.m in Sources */,
+                               DC3A9B2823A9D8C40073ED06 /* Container_BottledPeers.swift in Sources */,
+                               DC391FA621C04D1500772585 /* OctagonPeerKeys.swift in Sources */,
+                               DCF6320521C074F30030CCC0 /* CuttlefishAPIHelpers.swift in Sources */,
+                               DC391F8C21BF222B00772585 /* CKKSTLKShare.m in Sources */,
+                               DCAA209C23AAF93700DCB594 /* Container_RecoveryKey.swift in Sources */,
+                               BE9F8D19206C4AD300B53D16 /* ContainerMap.swift in Sources */,
+                               BE9F4F8C2072D881004A52C2 /* Cuttlefish.pb.swift in Sources */,
+                               DC9978B82404AA3200A5EE2F /* Container_UserSync.swift in Sources */,
+                               DC391F9D21BF2F8100772585 /* CKKSConstants.m in Sources */,
+                               BE9F8D10206C099800B53D16 /* Container.swift in Sources */,
+                               0CB582D3218920090040C5F2 /* OTPrivateKey.m in Sources */,
+                               DC25B3AC233C2EBC00CB1409 /* CloudKitCategories.m in Sources */,
+                               BE55C77C2044D0C90045863D /* Client.swift in Sources */,
+                               BE55C77E2044D7E60045863D /* main.swift in Sources */,
+                               DCAD8F8622C43EC1007C3872 /* Container_MachineIDs.swift in Sources */,
+                               DCB0C295222F5EF60083AECB /* CuttlefishErrors.swift in Sources */,
+                               0CB582D021891FF40040C5F2 /* OTBottle.m in Sources */,
+                               DC880F6B243D4D730059806D /* CKKSLogging.m in Sources */,
+                               0C0C4F86216FB73C00C14C61 /* EscrowKeys.swift in Sources */,
+                               DCB9475621274A1900ED9272 /* TPHObjcTranslation.m in Sources */,
+                               0C3BB35A2188E18C0018FC14 /* OTAuthenticatedCiphertext+SF.m in Sources */,
+                               0C468FF923C7D4E3006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */,
+                               0C0CB73923AD714D0020C6BF /* Container_EscrowRecords.swift in Sources */,
+                               0CE15E3E222DF6A800B7EAA4 /* OTRecovery.m in Sources */,
+                               DC391F8E21BF274600772585 /* CKKSPeer.m in Sources */,
+                               DC391F8A21BF222500772585 /* CKKSKeychainBackedKey.m in Sources */,
+                               0C0C4F87216FB73F00C14C61 /* BottledPeer.swift in Sources */,
+                               0C3DF8C824789C3C009CF03A /* Container_Peers.swift in Sources */,
+                               0CB582D2218920090040C5F2 /* OTBottleContents.m in Sources */,
+                               DC391F8F21BF284D00772585 /* CKKSSerializedKey.m in Sources */,
+                               BEC0A96420B362EC00DBD772 /* Utils.swift in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               BECFA42A20F91AFE00B11002 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               BECFA43120F91AFE00B11002 /* main.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                BED208D51EDF950E00753952 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                BED208D51EDF950E00753952 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -29074,22 +34092,106 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               BED987CF2099145300607A5F /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1B0CDF64231C9E0E004401F0 /* ContainerMap.swift in Sources */,
+                               0CB582CB2189157F0040C5F2 /* OTPrivateKey.m in Sources */,
+                               EBF5323A21C8B6330073C1C7 /* OTDefines.m in Sources */,
+                               0CB582C92189157F0040C5F2 /* OTBottle.m in Sources */,
+                               0CA4B4722171410200B17169 /* EscrowKeys.swift in Sources */,
+                               BE536030209BC1FD0027E25A /* spi.c in Sources */,
+                               BEA8558120B5DC7D00D5AD11 /* FakeCuttlefish.swift in Sources */,
+                               DC9978BB2404B26900A5EE2F /* Container_UserSync.swift in Sources */,
+                               0CB5C678218B803C0044F730 /* OTPrivateKey+SF.m in Sources */,
+                               DC05035E214083B200A8EDB7 /* TPHObjcTranslation.m in Sources */,
+                               0CE15E41222DF6A800B7EAA4 /* OTRecovery.m in Sources */,
+                               BE536031209BC2F90027E25A /* SecdWatchdog.m in Sources */,
+                               0CB582C82189157F0040C5F2 /* OTAuthenticatedCiphertext.m in Sources */,
+                               0C468FFC23C7D4EF006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */,
+                               BED987E320991C4D00607A5F /* MockCuttlefish.swift in Sources */,
+                               BEC373D020D87B4D00DBDF5B /* SecFramework.c in Sources */,
+                               0CB582CA2189157F0040C5F2 /* OTBottleContents.m in Sources */,
+                               0C3DF8C924789D06009CF03A /* Container_Peers.swift in Sources */,
+                               BE536032209BC3250027E25A /* server_endpoint.m in Sources */,
+                               BE536034209BC3C40027E25A /* server_security_helpers.m in Sources */,
+                               BECFA43E20F9493000B11002 /* Policy.swift in Sources */,
+                               0CA2282F2187A5CA00A1C56C /* BottledPeer.swift in Sources */,
+                               DC880F6A243D4D640059806D /* CKKSLogging.m in Sources */,
+                               DC747993222720C8001E0E8C /* MockCloudKit.m in Sources */,
+                               0CB5C677218B803C0044F730 /* OTAuthenticatedCiphertext+SF.m in Sources */,
+                               BE727824209CBCA800F0DA77 /* Cuttlefish.pb.swift in Sources */,
+                               BED987E120991B9B00607A5F /* Decrypter.swift in Sources */,
+                               DC391FA721C04D6800772585 /* OctagonPeerKeys.swift in Sources */,
+                               BE536033209BC3B30027E25A /* server_entitlement_helpers.c in Sources */,
+                               DCAA209B23AAF8FD00DCB594 /* Container_RecoveryKey.swift in Sources */,
+                               BED987E020991B1100607A5F /* TrustedPeersHelper.xcdatamodeld in Sources */,
+                               0C468FFA23C7D4EF006F4582 /* OTEscrowRecord.m in Sources */,
+                               BED987D62099145300607A5F /* TrustedPeersHelperUnitTests.swift in Sources */,
+                               BE4C6AB820CAF4F700EAD6BE /* ContainerSync.swift in Sources */,
+                               0CE15E46222DF6A800B7EAA4 /* Recovery.m in Sources */,
+                               0CE15E33222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */,
+                               0CE15E2F222DF63600B7EAA4 /* RecoveryKey.swift in Sources */,
+                               0C468FFB23C7D4EF006F4582 /* OTEscrowRecordMetadata.m in Sources */,
+                               DCF6320721C075210030CCC0 /* CuttlefishAPIHelpers.swift in Sources */,
+                               0C0CB73B23AD71650020C6BF /* Container_EscrowRecords.swift in Sources */,
+                               BED987DE2099156B00607A5F /* Container.swift in Sources */,
+                               DCB0C292222F5E1D0083AECB /* CuttlefishErrors.swift in Sources */,
+                               BECFA44320FD0A4B00B11002 /* LocalKeychainAnalytics.m in Sources */,
+                               DCAD8F8922C43EDB007C3872 /* Container_MachineIDs.swift in Sources */,
+                               0CF70BDA218BEFAE00EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */,
+                               DCD24DEC228C9A480052604C /* SetValueTransformer.swift in Sources */,
+                               DC14C4C223AAACED007F673F /* Container_BottledPeers.swift in Sources */,
+                               BEC0A96520B362EC00DBD772 /* Utils.swift in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                BEF88C231EAFFC3F00357577 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                BEF88C781EB000BE00357577 /* TPCategoryRule.m in Sources */,
                                BEF88C841EB000BE00357577 /* TPPeerDynamicInfo.m in Sources */,
                BEF88C231EAFFC3F00357577 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                BEF88C781EB000BE00357577 /* TPCategoryRule.m in Sources */,
                                BEF88C841EB000BE00357577 /* TPPeerDynamicInfo.m in Sources */,

-                               BEF88C921EB000BE00357577 /* TPVoucher.m in Sources */,
-                               BEF88C901EB000BE00357577 /* TPUtils.m in Sources */,

                                BEF88C8A1EB000BE00357577 /* TPPolicy.m in Sources */,
                                BEF88C8A1EB000BE00357577 /* TPPolicy.m in Sources */,

+                               DC730E1C224011E40051DD48 /* TPPBDictionaryMatchingRuleFieldExists.m in Sources */,

                                BEF88C801EB000BE00357577 /* TPModel.m in Sources */,
                                BEF88C8C1EB000BE00357577 /* TPPolicyDocument.m in Sources */,
                                BEF88C801EB000BE00357577 /* TPModel.m in Sources */,
                                BEF88C8C1EB000BE00357577 /* TPPolicyDocument.m in Sources */,

+                               DC2B9A5323147A3800D4C79D /* TPMachineID.m in Sources */,

                                BEF88C7E1EB000BE00357577 /* TPHash.m in Sources */,
                                BEF88C7E1EB000BE00357577 /* TPHash.m in Sources */,

+                               DC730E1D224011E70051DD48 /* TPPBDictionaryMatchingRuleFieldRegexMatch.m in Sources */,
+                               DC730E1B224011E20051DD48 /* TPPBDictionaryMatchingRule.m in Sources */,

                                BEF88C881EB000BE00357577 /* TPPeerStableInfo.m in Sources */,
                                BEF88C881EB000BE00357577 /* TPPeerStableInfo.m in Sources */,

+                               BEB49F31206E98D0008DA7F4 /* TPECPublicKeyFactory.m in Sources */,

                                BEF88C861EB000BE00357577 /* TPPeerPermanentInfo.m in Sources */,
                                BEF88C861EB000BE00357577 /* TPPeerPermanentInfo.m in Sources */,

-                               BEF88C7A1EB000BE00357577 /* TPCircle.m in Sources */,
+                               1B4C444C223AE65500C6F97F /* TPPBPolicyKeyViewMapping.m in Sources */,
+                               DC9061B922B02BA30071474D /* TPTypes.m in Sources */,
+                               BEB49F35206E9A1A008DA7F4 /* SFKey+TPKey.m in Sources */,

                                BEF88C821EB000BE00357577 /* TPPeer.m in Sources */,
                                BEF88C821EB000BE00357577 /* TPPeer.m in Sources */,

+                               DCD7DD9F22B868F800161396 /* TPPBDispositionDuplicateMachineID.m in Sources */,
+                               DCB4584C2240396E00115F8C /* NSError+UsefulConstructors.m in Sources */,
+                               BECEC11320A508F600E97255 /* TPVoucher.m in Sources */,
+                               BECFA46420FFB87500B11002 /* TPKey.m in Sources */,
+                               DCF458B3221F6964007F5507 /* TPLog.m in Sources */,
+                               DCE0775E21ADD71C002662FD /* TPPBDispositionEntry.m in Sources */,
+                               DCAD8F8D22C55D76007C3872 /* TPPBDispositionDisallowedMachineID.m in Sources */,
+                               DCE0776021ADD71C002662FD /* TPPBAncientEpoch.m in Sources */,
+                               DCE0776221ADD71C002662FD /* TPPBPolicyProhibits.m in Sources */,
+                               DCE0776421ADD71C002662FD /* TPPBUnknownMachineID.m in Sources */,
+                               DCE0776621ADD71C002662FD /* TPPBDisposition.m in Sources */,
+                               DCE0776821ADD71C002662FD /* TPPBPeerPermanentInfo.m in Sources */,
+                               DC730E1222400D790051DD48 /* TPDictionaryMatchingRules.m in Sources */,
+                               DCE0776A21ADD71C002662FD /* TPPBPeerDynamicInfo.m in Sources */,
+                               DCE0776C21ADD71C002662FD /* TPPBPolicySecret.m in Sources */,
+                               DCE0776E21ADD71C002662FD /* TPPBPeerStableInfo.m in Sources */,
+                               DCC03FA523FF521100A4DA3F /* TPSyncingPolicy.m in Sources */,
+                               DCE0777021ADD71C002662FD /* TPPBVoucher.m in Sources */,
+                               DCE0777221ADD71C002662FD /* TPPBPolicyDocument.m in Sources */,
+                               DCE0777421ADD71C002662FD /* TPPBPolicyCategoriesByView.m in Sources */,
+                               DCE0777621ADD71C002662FD /* TPPBPolicyIntroducersByCategory.m in Sources */,
+                               DA700FCA2310C0E00051A7DE /* TPStringTable.m in Sources */,
+                               DCE0777821ADD71C002662FD /* TPPBPolicyModelToCategory.m in Sources */,
+                               DCE0777A21ADD71C002662FD /* TPPBPolicyRedaction.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29097,17 +34199,22 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               1B4AE38722400A22002188E1 /* TPDictionaryMatchingRules.m in Sources */,
+                               DA31CB212319DC8F0039F1CC /* TPStringTable.m in Sources */,

                                BEF88C941EB000FD00357577 /* TPDummyDecrypter.m in Sources */,
                                BEF88C941EB000FD00357577 /* TPDummyDecrypter.m in Sources */,

-                               BEF88C9D1EB000FD00357577 /* TPUtilsTests.m in Sources */,

                                BEF88C951EB000FD00357577 /* TPDummyEncrypter.m in Sources */,
                                BEF88C951EB000FD00357577 /* TPDummyEncrypter.m in Sources */,

+                               BE72782B209D27C800F0DA77 /* TPKeyTests.m in Sources */,

                                BEF88C981EB000FD00357577 /* TPModelTests.m in Sources */,
                                BEF88C981EB000FD00357577 /* TPModelTests.m in Sources */,

+                               DA3AD86A2319AA5D0049AFD6 /* TPStringTableTests.m in Sources */,
+                               DC730E142240103A0051DD48 /* TPDictionaryMatchingRuleTests.m in Sources */,
+                               E291657F2048BCCB0046512B /* TPPBPeerStableInfoTests.m in Sources */,

                                BEF88C9B1EB000FD00357577 /* TPPeerTests.m in Sources */,
                                BEF88C9B1EB000FD00357577 /* TPPeerTests.m in Sources */,

-                               BEF88C931EB000FD00357577 /* TPCircleTests.m in Sources */,
+                               BEB49F37206E9B8B008DA7F4 /* TPECPublicKeyFactoryTests.m in Sources */,

                                BEF88C971EB000FD00357577 /* TPDummySigningKeyTests.m in Sources */,
                                BEF88C971EB000FD00357577 /* TPDummySigningKeyTests.m in Sources */,

+                               1BF640EF222EEB6C002D0FCB /* TPPolicyTests.m in Sources */,

                                BEF88C9A1EB000FD00357577 /* TPPeerStableInfoTests.m in Sources */,
                                BEF88C991EB000FD00357577 /* TPPeerPermanentInfoTests.m in Sources */,
                                BEF88C961EB000FD00357577 /* TPDummySigningKey.m in Sources */,
                                BEF88C9A1EB000FD00357577 /* TPPeerStableInfoTests.m in Sources */,
                                BEF88C991EB000FD00357577 /* TPPeerPermanentInfoTests.m in Sources */,
                                BEF88C961EB000FD00357577 /* TPDummySigningKey.m in Sources */,

-                               BEF88C9E1EB000FD00357577 /* TPVoucherTests.m in Sources */,

                                BEF88C9C1EB000FD00357577 /* TPPolicyDocumentTests.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                BEF88C9C1EB000FD00357577 /* TPPolicyDocumentTests.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -29121,6 +34228,188 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               D42C839521159146008D3D83 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D43718A12116836300EA350A /* cmsutil.c in Sources */,
+                               D43718A82116839300EA350A /* siginfoUtils.cpp in Sources */,
+                               D437186E211682D800EA350A /* cert.c in Sources */,
+                               D43718782116831A00EA350A /* cmsdigest.c in Sources */,
+                               D437187B2116831A00EA350A /* cmsmessage.c in Sources */,
+                               D437186B211682D800EA350A /* cmsattr.c in Sources */,
+                               D437187D2116831A00EA350A /* cmsencdata.c in Sources */,
+                               D437188B2116834400EA350A /* cmssiginfo.c in Sources */,
+                               D437188F2116834400EA350A /* cmspubkey.c in Sources */,
+                               D437189E2116836300EA350A /* plhash.c in Sources */,
+                               D43718AA2116839300EA350A /* secoid.c in Sources */,
+                               D437188E2116834400EA350A /* cmsrecinfo.c in Sources */,
+                               D43718792116831A00EA350A /* cmsenvdata.c in Sources */,
+                               D43718992116836300EA350A /* secalgid.c in Sources */,
+                               D42C839C21159170008D3D83 /* CMSEncoder.cpp in Sources */,
+                               D42C839D21159170008D3D83 /* CMSUtils.cpp in Sources */,
+                               D437186A211682D800EA350A /* cmsarray.c in Sources */,
+                               D43718AD2116839300EA350A /* smimeutil.c in Sources */,
+                               D437186C211682D800EA350A /* cmsasn1.c in Sources */,
+                               D437186D211682D800EA350A /* cmscinfo.c in Sources */,
+                               D43718B0211683AA00EA350A /* tsaSupport.c in Sources */,
+                               D4371869211682D800EA350A /* cmscipher.c in Sources */,
+                               D43718B1211683AA00EA350A /* tsaTemplates.c in Sources */,
+                               D437189B2116836300EA350A /* secitem.c in Sources */,
+                               D437188C2116834400EA350A /* cmssigdata.c in Sources */,
+                               D42C839E21159170008D3D83 /* CMSDecoder.cpp in Sources */,
+                               D437187A2116831A00EA350A /* cmsdecode.c in Sources */,
+                               D437187F2116831A00EA350A /* cmsdigdata.c in Sources */,
+                               D437189C2116836300EA350A /* cryptohi.c in Sources */,
+                               D43718882116834400EA350A /* cmsreclist.c in Sources */,
+                               D437187C2116831A00EA350A /* cmsencode.c in Sources */,
+                               D437189F2116836300EA350A /* SecCMS.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D44D1F632115893000E76E1A /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D44D1F7921158A3D00E76E1A /* cmspubkey.c in Sources */,
+                               D4D1FDD621164138003538E2 /* cmssigdata.c in Sources */,
+                               D44D1F7321158A1700E76E1A /* secoid.c in Sources */,
+                               D44D1F7C21158A4900E76E1A /* cmsencdata.c in Sources */,
+                               D44D1F8021158A5B00E76E1A /* cmsarray.c in Sources */,
+                               D42C838121158ACC008D3D83 /* crypto-embedded.c in Sources */,
+                               D44D1F7E21158A5300E76E1A /* cmsdecode.c in Sources */,
+                               D44D1F70211589AC00E76E1A /* CMSDecoder.c in Sources */,
+                               D42C837F21158ACC008D3D83 /* cmsreclist.c in Sources */,
+                               D44D1F7221158A1300E76E1A /* smimeutil.c in Sources */,
+                               D42C837E21158ACC008D3D83 /* cmsencode.c in Sources */,
+                               D44D1F7621158A3300E76E1A /* cmsutil.c in Sources */,
+                               D44D1F7D21158A4C00E76E1A /* cmsdigdata.c in Sources */,
+                               D42C837D21158ACC008D3D83 /* cmsdigest.c in Sources */,
+                               D42C838921158B4E008D3D83 /* SecAsn1Item.c in Sources */,
+                               D44D1F7A21158A4000E76E1A /* cmsmessage.c in Sources */,
+                               D44D1F8121158A5D00E76E1A /* cmsasn1.c in Sources */,
+                               D44D1F7421158A1A00E76E1A /* secalgid.c in Sources */,
+                               D44D1F7B21158A4400E76E1A /* cmsenvdata.c in Sources */,
+                               D44D1F71211589AC00E76E1A /* CMSEncoder.c in Sources */,
+                               D44D1F7821158A3A00E76E1A /* cmsrecinfo.c in Sources */,
+                               D42C837C21158ACC008D3D83 /* cmscinfo.c in Sources */,
+                               D44D1F8221158A6000E76E1A /* cmsattr.c in Sources */,
+                               D4D1FDD721164167003538E2 /* cmscipher.c in Sources */,
+                               D44D1F7521158A1E00E76E1A /* plhash.c in Sources */,
+                               D44D1F6F2115899C00E76E1A /* CMSUtils.c in Sources */,
+                               D42C838021158ACC008D3D83 /* cmssiginfo.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D453A4A72122236D00850A26 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D477CB83237F692400C02355 /* RevocationTests.m in Sources */,
+                               D40881F5217573C900180E81 /* SecTrustStatusCodes.c in Sources */,
+                               D4FD421D217D789C002B7EE2 /* NameConstraintsTests.m in Sources */,
+                               D4FD4221217D7B2E002B7EE2 /* PathScoringTests.m in Sources */,
+                               D477CB88237F8B2F00C02355 /* CAIssuerTests.m in Sources */,
+                               D40881F42175738C00180E81 /* SecPolicyLeafCallbacks.c in Sources */,
+                               D40881F32175733F00180E81 /* SecPolicy.c in Sources */,
+                               D477CB7C237E4BD700C02355 /* ExceptionTests.m in Sources */,
+                               D40881F22175733500180E81 /* SecSignatureVerificationSupport.c in Sources */,
+                               D40881F12175732E00180E81 /* SecCertificate.c in Sources */,
+                               D40881F02175732600180E81 /* SecTrustStore.c in Sources */,
+                               D477CB90237F975500C02355 /* ValidTests.m in Sources */,
+                               D40881EF2175731E00180E81 /* SecTrust.c in Sources */,
+                               D458C523214E33380043D982 /* KeySizeTests.m in Sources */,
+                               D477CB8C237F8DBC00C02355 /* AllowlistBlocklistTests.m in Sources */,
+                               D458C4BD214E19AF0043D982 /* SignatureAlgorithmTests.m in Sources */,
+                               D477CB6B237CBA2C00C02355 /* TrustDaemonTestCase.m in Sources */,
+                               D458C4B1214E198F0043D982 /* CTTests.m in Sources */,
+                               D458C4B9214E19AF0043D982 /* PathParseTests.m in Sources */,
+                               D458C516214E286D0043D982 /* PolicyTests.m in Sources */,
+                               D458C524214E33430043D982 /* VerifyDateTests.m in Sources */,
+                               D458C4B3214E198F0043D982 /* EvaluationBasicTests.m in Sources */,
+                               D458C521214E33260043D982 /* ECTests.m in Sources */,
+                               D458C4BB214E19AF0043D982 /* iAPTests.m in Sources */,
+                               D4AC8BE921320AD0006E9871 /* CertificateParseTests.m in Sources */,
+                               D4D92DA622788FEB0009A7CF /* NISTTests.m in Sources */,
+                               D442830022D68564001746B3 /* TrustEvaluationTestHelpers.m in Sources */,
+                               D453A4AB2122236D00850A26 /* TrustEvaluationTestCase.m in Sources */,
+                               D453A4AD2122236D00850A26 /* TrustFrameworkTestCase.m in Sources */,
+                               D49A370D23877ECC0065719F /* OCSPCacheTests.m in Sources */,
+                               D4EA5CF922B225D100883439 /* LoggingServerTests.m in Sources */,
+                               D458DAC42375FEA300E5890E /* TrustSettingsTests.m in Sources */,
+                               D4056A1B22712A650026E24E /* SSLPolicyTests.m in Sources */,
+                               D458C4C4214E19FC0043D982 /* TrustInterfaceTests.m in Sources */,
+                               D453A4AF2122236D00850A26 /* CertificateInterfaceTests.m in Sources */,
+                               D458C4C2214E19FC0043D982 /* TrustSettingsInterfaceTests.m in Sources */,
+                               D423114423725F9F000E470A /* SMIMEPolicyTests.m in Sources */,
+                               D477CB5D237B6E0E00C02355 /* PersonalizationTests.m in Sources */,
+                               BED07B862542A2CE00FED203 /* CARevocationTests.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D458C4DD214E1DE00043D982 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D458C4FB214E1E1B0043D982 /* ViewController.m in Sources */,
+                               D458C4F9214E1E1B0043D982 /* AppDelegate.m in Sources */,
+                               D458C4FD214E1E6C0043D982 /* appmain.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D458C502214E20530043D982 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D458C510214E207C0043D982 /* main.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               D4707A0121136E69005BCFDA /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D477CB6A237CBA2C00C02355 /* TrustDaemonTestCase.m in Sources */,
+                               D49A370C23877ECC0065719F /* OCSPCacheTests.m in Sources */,
+                               D40881FA217573F800180E81 /* SecPolicy.c in Sources */,
+                               D477CB8B237F8DBC00C02355 /* AllowlistBlocklistTests.m in Sources */,
+                               D40881FB217573F800180E81 /* SecPolicyLeafCallbacks.c in Sources */,
+                               D40881F9217573EF00180E81 /* SecSignatureVerificationSupport.c in Sources */,
+                               D40881F8217573E700180E81 /* SecCertificate.c in Sources */,
+                               D40881F7217573E000180E81 /* SecTrustStore.c in Sources */,
+                               D4D92DA522788FEB0009A7CF /* NISTTests.m in Sources */,
+                               D40881F6217573D500180E81 /* SecTrust.c in Sources */,
+                               D458C520214E33260043D982 /* ECTests.m in Sources */,
+                               D458C522214E33370043D982 /* KeySizeTests.m in Sources */,
+                               D4056A1A22712A650026E24E /* SSLPolicyTests.m in Sources */,
+                               D4EA5CF822B225D100883439 /* LoggingServerTests.m in Sources */,
+                               D4FD4220217D7B2E002B7EE2 /* PathScoringTests.m in Sources */,
+                               D458C4BC214E19AF0043D982 /* SignatureAlgorithmTests.m in Sources */,
+                               D4FD421C217D789C002B7EE2 /* NameConstraintsTests.m in Sources */,
+                               D477CB5C237B6E0E00C02355 /* PersonalizationTests.m in Sources */,
+                               D4A0F8CC211E6A8300443CA1 /* TrustEvaluationTestCase.m in Sources */,
+                               D477CB87237F8B2F00C02355 /* CAIssuerTests.m in Sources */,
+                               D4A0F8C7211E6A5800443CA1 /* TrustFrameworkTestCase.m in Sources */,
+                               D458C4C3214E19FC0043D982 /* TrustInterfaceTests.m in Sources */,
+                               D4AC8BE821320AD0006E9871 /* CertificateParseTests.m in Sources */,
+                               D4A0F8C8211E6A5800443CA1 /* CertificateInterfaceTests.m in Sources */,
+                               D423114323725F9F000E470A /* SMIMEPolicyTests.m in Sources */,
+                               D458C4B0214E198F0043D982 /* CTTests.m in Sources */,
+                               D477CB8F237F975500C02355 /* ValidTests.m in Sources */,
+                               D458C4B2214E198F0043D982 /* EvaluationBasicTests.m in Sources */,
+                               D477CB82237F692400C02355 /* RevocationTests.m in Sources */,
+                               BED07AAC2542A2CC00FED203 /* CARevocationTests.m in Sources */,
+                               D458C4BA214E19AF0043D982 /* iAPTests.m in Sources */,
+                               D458C4B8214E19AF0043D982 /* PathParseTests.m in Sources */,
+                               D458C525214E33440043D982 /* VerifyDateTests.m in Sources */,
+                               D458C515214E286C0043D982 /* PolicyTests.m in Sources */,
+                               D458DAC32375FEA300E5890E /* TrustSettingsTests.m in Sources */,
+                               D477CB7B237E4BD700C02355 /* ExceptionTests.m in Sources */,
+                               D4EF32182156DDEB000A31A5 /* TrustSettingsInterfaceTests.m in Sources */,
+                               D44282FF22D68564001746B3 /* TrustEvaluationTestHelpers.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                D4ADA3151E2B41670031CEA3 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                D4ADA3151E2B41670031CEA3 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -29133,15 +34422,19 @@
                                D43DBF011E99D1CA00C04AEA /* SecCAIssuerRequest.m in Sources */,
                                D43DBF021E99D1CA00C04AEA /* SecCertificateServer.c in Sources */,
                                D43DBF031E99D1CA00C04AEA /* SecCertificateSource.c in Sources */,
                                D43DBF011E99D1CA00C04AEA /* SecCAIssuerRequest.m in Sources */,
                                D43DBF021E99D1CA00C04AEA /* SecCertificateServer.c in Sources */,
                                D43DBF031E99D1CA00C04AEA /* SecCertificateSource.c in Sources */,

+                               5F84950222DFB505008B3EFB /* SecTrustExceptionResetCount.m in Sources */,

                                D43DBF041E99D1CA00C04AEA /* SecOCSPCache.c in Sources */,
                                D43DBF051E99D1CA00C04AEA /* SecOCSPRequest.c in Sources */,
                                D43DBF041E99D1CA00C04AEA /* SecOCSPCache.c in Sources */,
                                D43DBF051E99D1CA00C04AEA /* SecOCSPRequest.c in Sources */,

+                               D47C457A255244AD00460750 /* CertificateTransparency.m in Sources */,
+                               D4B68C68211A827C009FED69 /* trustd_spi.c in Sources */,

                                D43761671EB2996C00954447 /* SecRevocationNetworking.m in Sources */,
                                D43761671EB2996C00954447 /* SecRevocationNetworking.m in Sources */,

+                               D4EF3221215F0F7F000A31A5 /* SecTrustStoreServer.m in Sources */,

                                D43DBF061E99D1CA00C04AEA /* SecOCSPResponse.c in Sources */,
                                D43DBF071E99D1CA00C04AEA /* SecPinningDb.m in Sources */,
                                D43DBF081E99D1CA00C04AEA /* SecPolicyServer.c in Sources */,
                                D43DBF091E99D1CA00C04AEA /* SecRevocationDb.c in Sources */,
                                D43DBF061E99D1CA00C04AEA /* SecOCSPResponse.c in Sources */,
                                D43DBF071E99D1CA00C04AEA /* SecPinningDb.m in Sources */,
                                D43DBF081E99D1CA00C04AEA /* SecPolicyServer.c in Sources */,
                                D43DBF091E99D1CA00C04AEA /* SecRevocationDb.c in Sources */,

-                               D46B37A62151B7950083DAAA /* SecTrustStoreServer.m in Sources */,

                                D43DBF0A1E99D1CA00C04AEA /* SecRevocationServer.c in Sources */,
                                D43DBF0A1E99D1CA00C04AEA /* SecRevocationServer.c in Sources */,

+                               D47DCCB523427C7D00B80E37 /* md.m in Sources */,

                                D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.m in Sources */,
                                D4961BC42079424200F16DA7 /* TrustURLSessionDelegate.m in Sources */,
                                D43DBF0C1E99D1CA00C04AEA /* SecTrustServer.c in Sources */,
                                D43DBF0B1E99D1CA00C04AEA /* SecTrustLoggingServer.m in Sources */,
                                D4961BC42079424200F16DA7 /* TrustURLSessionDelegate.m in Sources */,
                                D43DBF0C1E99D1CA00C04AEA /* SecTrustServer.c in Sources */,


@@ -29150,6 +34443,16 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               D4D1FDD921165F8B003538E2 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4D1FDE221165FC6003538E2 /* cms-trust-settings-test.c in Sources */,
+                               D437185F211671A500EA350A /* cms-01-basic.c in Sources */,
+                               D4371860211671A500EA350A /* smime-cms-test.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DA30D6721DF8C8FB00EC6B43 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                DA30D6721DF8C8FB00EC6B43 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -29158,6 +34461,20 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DA41FE0A2241ADC000838FB3 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DACAD62A229F6E6A0002BBC3 /* OTPairingSession.m in Sources */,
+                               DA45865C2245AEDB0073F993 /* OTPairingService.m in Sources */,
+                               DA41FE1A2241AF4600838FB3 /* main.m in Sources */,
+                               0CC593F02299B9AA006C34B5 /* SecInternalRelease.c in Sources */,
+                               0CC593F62299EC3D006C34B5 /* OTDeviceInformationAdapter.m in Sources */,
+                               DAC58D202244528B00D4CD41 /* OTPairingPacketContext.m in Sources */,
+                               DA20716222E9367500E209E4 /* NSError+UsefulConstructors.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DAE40BC620CF3E46002D5674 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                DAE40BC620CF3E46002D5674 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -29183,6 +34500,13 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC05037221409A4000A8EDB7 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC0BC54D1D8B6D2D00070CB0 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                DC0BC54D1D8B6D2D00070CB0 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -29262,9 +34586,7 @@
                                DC0BC6701D8B755200070CB0 /* elliptic.c in Sources */,
                                DC0BC6731D8B755200070CB0 /* ellipticProj.c in Sources */,
                                DC0BC6751D8B755200070CB0 /* enc64.c in Sources */,
                                DC0BC6701D8B755200070CB0 /* elliptic.c in Sources */,
                                DC0BC6731D8B755200070CB0 /* ellipticProj.c in Sources */,
                                DC0BC6751D8B755200070CB0 /* enc64.c in Sources */,

-                               DC0BC6771D8B755200070CB0 /* engineNSA127.c in Sources */,

                                DC0BC6781D8B755200070CB0 /* falloc.c in Sources */,
                                DC0BC6781D8B755200070CB0 /* falloc.c in Sources */,

-                               DC0BC67C1D8B755200070CB0 /* feeDES.c in Sources */,

                                DC0BC67E1D8B755200070CB0 /* feeDigitalSignature.c in Sources */,
                                DC0BC6801D8B755200070CB0 /* feeECDSA.c in Sources */,
                                DC0BC6821D8B755200070CB0 /* feeFEED.c in Sources */,
                                DC0BC67E1D8B755200070CB0 /* feeDigitalSignature.c in Sources */,
                                DC0BC6801D8B755200070CB0 /* feeECDSA.c in Sources */,
                                DC0BC6821D8B755200070CB0 /* feeFEED.c in Sources */,


@@ -29273,8 +34595,6 @@
                                DC0BC6891D8B755200070CB0 /* feePublicKey.c in Sources */,
                                DC0BC68C1D8B755200070CB0 /* feeRandom.c in Sources */,
                                DC0BC68F1D8B755200070CB0 /* giantIntegers.c in Sources */,
                                DC0BC6891D8B755200070CB0 /* feePublicKey.c in Sources */,
                                DC0BC68C1D8B755200070CB0 /* feeRandom.c in Sources */,
                                DC0BC68F1D8B755200070CB0 /* giantIntegers.c in Sources */,

-                               DC0BC6931D8B755200070CB0 /* giantPort_PPC.c in Sources */,
-                               DC0BC6961D8B755200070CB0 /* giantPort_PPC_Gnu.s in Sources */,

                                DC0BC69A1D8B755200070CB0 /* platform.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DC0BC69A1D8B755200070CB0 /* platform.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -29289,6 +34609,7 @@
                                DC0BC7A21D8B773000070CB0 /* cssmcontext.cpp in Sources */,
                                DC0BC7B21D8B773000070CB0 /* oidsalg.c in Sources */,
                                DC0BC7AA1D8B773000070CB0 /* modload_plugin.cpp in Sources */,
                                DC0BC7A21D8B773000070CB0 /* cssmcontext.cpp in Sources */,
                                DC0BC7B21D8B773000070CB0 /* oidsalg.c in Sources */,
                                DC0BC7AA1D8B773000070CB0 /* modload_plugin.cpp in Sources */,

+                               6C97434A24D1C8DE00A2025C /* LegacyAPICounts.m in Sources */,

                                DC0BC7B41D8B773000070CB0 /* oidscrl.cpp in Sources */,
                                DC0BC79B1D8B773000070CB0 /* attachfactory.cpp in Sources */,
                                DC0BC7A51D8B773000070CB0 /* cssmmds.cpp in Sources */,
                                DC0BC7B41D8B773000070CB0 /* oidscrl.cpp in Sources */,
                                DC0BC79B1D8B773000070CB0 /* attachfactory.cpp in Sources */,
                                DC0BC7A51D8B773000070CB0 /* cssmmds.cpp in Sources */,


@@ -29402,6 +34723,10 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               5AA465CF2228AF4B00C068F4 /* SecProtocol.c in Sources */,
+                               5AA465D02228AF4B00C068F4 /* SecProtocolHelper.m in Sources */,
+                               5AA465D12228AF4B00C068F4 /* SecProtocolConfiguration.m in Sources */,
+                               5AA465D22228AF4B00C068F4 /* SecProtocolTypes.m in Sources */,

                                DC0BC9FA1D8B827200070CB0 /* sslRecord.c in Sources */,
                                DC0BC9F91D8B827200070CB0 /* sslContext.c in Sources */,
                                DC0BC9FC1D8B827200070CB0 /* tlsCallbacks.c in Sources */,
                                DC0BC9FA1D8B827200070CB0 /* sslRecord.c in Sources */,
                                DC0BC9F91D8B827200070CB0 /* sslContext.c in Sources */,
                                DC0BC9FC1D8B827200070CB0 /* tlsCallbacks.c in Sources */,


@@ -29512,7 +34837,6 @@
                                DC0BCD961D8C6A1E00070CB0 /* der_dictionary.c in Sources */,
                                DC0BCD751D8C6A1E00070CB0 /* iCloudKeychainTrace.c in Sources */,
                                DC0BCD821D8C6A1E00070CB0 /* SecCFWrappers.c in Sources */,
                                DC0BCD961D8C6A1E00070CB0 /* der_dictionary.c in Sources */,
                                DC0BCD751D8C6A1E00070CB0 /* iCloudKeychainTrace.c in Sources */,
                                DC0BCD821D8C6A1E00070CB0 /* SecCFWrappers.c in Sources */,

-                               EB4B6E201DC0682A00AFC494 /* SecADWrapper.c in Sources */,

                                DC0BCD941D8C6A1E00070CB0 /* der_date.c in Sources */,
                                DC0BCD9F1D8C6A1F00070CB0 /* fileIo.c in Sources */,
                                DC0BCDA81D8C6A1F00070CB0 /* SecFileLocations.c in Sources */,
                                DC0BCD941D8C6A1E00070CB0 /* der_date.c in Sources */,
                                DC0BCD9F1D8C6A1F00070CB0 /* fileIo.c in Sources */,
                                DC0BCDA81D8C6A1F00070CB0 /* SecFileLocations.c in Sources */,


@@ -29522,13 +34846,13 @@
                                DC0BCDAF1D8C6A1F00070CB0 /* SecAppleAnchor.c in Sources */,
                                DC0BCDA41D8C6A1F00070CB0 /* iOSforOSX-SecAttr.c in Sources */,
                                DC0BCD881D8C6A1E00070CB0 /* SecTrace.c in Sources */,
                                DC0BCDAF1D8C6A1F00070CB0 /* SecAppleAnchor.c in Sources */,
                                DC0BCDA41D8C6A1F00070CB0 /* iOSforOSX-SecAttr.c in Sources */,
                                DC0BCD881D8C6A1E00070CB0 /* SecTrace.c in Sources */,

+                               EB3FBC09232063A100DF52EA /* SecABC.m in Sources */,

                                DC0BCD9A1D8C6A1F00070CB0 /* der_plist_internal.c in Sources */,
                                DC0BCDAE1D8C6A1F00070CB0 /* SecSCTUtils.c in Sources */,
                                DC0BCD971D8C6A1E00070CB0 /* der_number.c in Sources */,
                                DC0BCDA51D8C6A1F00070CB0 /* iOSforOSX-SecRandom.c in Sources */,
                                DC0BCD841D8C6A1E00070CB0 /* SecCFError.c in Sources */,
                                DC0BCD981D8C6A1F00070CB0 /* der_plist.c in Sources */,
                                DC0BCD9A1D8C6A1F00070CB0 /* der_plist_internal.c in Sources */,
                                DC0BCDAE1D8C6A1F00070CB0 /* SecSCTUtils.c in Sources */,
                                DC0BCD971D8C6A1E00070CB0 /* der_number.c in Sources */,
                                DC0BCDA51D8C6A1F00070CB0 /* iOSforOSX-SecRandom.c in Sources */,
                                DC0BCD841D8C6A1E00070CB0 /* SecCFError.c in Sources */,
                                DC0BCD981D8C6A1F00070CB0 /* der_plist.c in Sources */,

-                               DC0BCD771D8C6A1E00070CB0 /* SecAKSWrappers.c in Sources */,

                                72CDF5191EC679A8002D233B /* sec_action.c in Sources */,
                                DC0BCD901D8C6A1E00070CB0 /* der_array.c in Sources */,
                                DC0BCD7F1D8C6A1E00070CB0 /* SecCFCCWrappers.c in Sources */,
                                72CDF5191EC679A8002D233B /* sec_action.c in Sources */,
                                DC0BCD901D8C6A1E00070CB0 /* der_array.c in Sources */,
                                DC0BCD7F1D8C6A1E00070CB0 /* SecCFCCWrappers.c in Sources */,


@@ -29539,12 +34863,13 @@
                                E78CCDC71E737F6700C1CFAA /* SecNSAdditions.m in Sources */,
                                DC0BCD921D8C6A1E00070CB0 /* der_null.c in Sources */,
                                DC0BCD9C1D8C6A1F00070CB0 /* der_set.c in Sources */,
                                E78CCDC71E737F6700C1CFAA /* SecNSAdditions.m in Sources */,
                                DC0BCD921D8C6A1E00070CB0 /* der_null.c in Sources */,
                                DC0BCD9C1D8C6A1F00070CB0 /* der_set.c in Sources */,

-                               DC0BCDAC1D8C6A1F00070CB0 /* simulate_crash.c in Sources */,
+                               DC36895821235F23003A3735 /* SecAKSWrappers.c in Sources */,
+                               EBB8528122F79F6E00424FD0 /* SecXPCHelper.m in Sources */,
+                               DC0BCDAC1D8C6A1F00070CB0 /* simulate_crash.m in Sources */,

                                DC0BCD791D8C6A1E00070CB0 /* SecBuffer.c in Sources */,
                                DC0BCDAB1D8C6A1F00070CB0 /* SecXPCError.c in Sources */,
                                DC0BCD791D8C6A1E00070CB0 /* SecBuffer.c in Sources */,
                                DC0BCDAB1D8C6A1F00070CB0 /* SecXPCError.c in Sources */,

-                               DC0BCDB51D8C6A5B00070CB0 /* not_on_this_platorm.c in Sources */,
-                               DC65E7C01D8CBB1500152EF0 /* readline.c in Sources */,

                                DA5B871D2065A8440093F083 /* SecAutorelease.m in Sources */,
                                DA5B871D2065A8440093F083 /* SecAutorelease.m in Sources */,

+                               EB71CF7822E825AF00DA3D0E /* SecTapToRadar.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29568,150 +34893,74 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC0EF8EB208697C600AB9E95 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB18A7BA2238C07600A0FC41 /* OTDeviceInformationAdapter.m in Sources */,
+                               DC74799E22272358001E0E8C /* CKKSSerializedKey.m in Sources */,
+                               EB3FBB4F231F836500DF52EA /* CKKSListenerCollection.m in Sources */,
+                               DC74799D22272344001E0E8C /* CKKSSIV.m in Sources */,
+                               DC74799C22272331001E0E8C /* CKKSPeer.m in Sources */,
+                               DC74799A222722BC001E0E8C /* CKKSKeychainBackedKey.m in Sources */,
+                               DC747999222722B2001E0E8C /* CKKSConstants.m in Sources */,
+                               DC7479982227229D001E0E8C /* CKKSTLKShare.m in Sources */,
+                               DC880F6C243D4DC00059806D /* CKKSLogging.m in Sources */,
+                               DC0EF8F2208697C600AB9E95 /* main.swift in Sources */,
+                               EB7ECF9623467FB400CE2D3C /* Cuttlefish.pb.swift in Sources */,
+                               DCD48BFE20BF3D83009A3224 /* tpctl-objc.m in Sources */,
+                               DCFFE9692277DEAF0092069C /* TrustedPeersHelperProtocol.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DC1788FF1D77980500B50D50 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                DC1788FF1D77980500B50D50 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               0CBD55B91FE883F300A8CE21 /* SFBehavior.m in Sources */,
-                               D46246A71F9AE62000D63882 /* oids.c in Sources */,
+                               DC2B757621F2A270003C9356 /* SecEscrowRequest.m in Sources */,
+                               BE7B8E142415579900E1CF4F /* SecSharedCredential.m in Sources */,
+                               0C84D8381FCF43BF00B822E3 /* OTControlProtocol.m in Sources */,

                                DCC585FF20BF8A7E005C7269 /* SecFramework.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 */,
                                DCC585FF20BF8A7E005C7269 /* SecFramework.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 */,

-                               AA44E0D82032515C001EA371 /* SecProtocolTypes.m in Sources */,

                                DCA85B941E8D97E400BA7241 /* client.c in Sources */,
                                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */,
                                DCA85B941E8D97E400BA7241 /* client.c in Sources */,
                                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */,

-                               0CBFEACA200FCD2D009A60E9 /* SFSignInAnalytics.m in Sources */,
-                               AA44E0D620325150001EA371 /* SecProtocol.c in Sources */,

                                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */,
                                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */,

-                               0C8BBF111FCB4AAA00580909 /* OTControl.m in Sources */,
+                               5A061191229ED6DB006AF14A /* NSDate+SFAnalytics.m in Sources */,
+                               EB9B285821C77C8D00173DC2 /* OTDefines.m in Sources */,

                                4723C9CD1F152ED40082882F /* SFSQLiteStatement.m in Sources */,
                                4723C9CD1F152ED40082882F /* SFSQLiteStatement.m in Sources */,

+                               AA9FD59D2152AFE30045A07A /* SecProtocolConfiguration.m in Sources */,
+                               5A04BAFB22976A16001848A0 /* OTClique.m in Sources */,
+                               DC372C8D22B4501900AB9F41 /* SecCoreAnalytics.m in Sources */,

                                EB10A3E920356E7A00E84270 /* OTConstants.m in Sources */,
                                6CAA8CFE1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                DC9C95C01F79DC89000D19E5 /* CKKSControl.m in Sources */,
                                EB10A3E920356E7A00E84270 /* OTConstants.m in Sources */,
                                6CAA8CFE1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                DC9C95C01F79DC89000D19E5 /* CKKSControl.m in Sources */,

+                               5AF594001FA0EE5300A5C1EC /* SecProtocol.c in Sources */,
+                               BE7B8E152415580D00E1CF4F /* SecSharedCredential.c in Sources */,
+                               5A442FAA233C351100918373 /* SecExperiment.m in Sources */,
+                               0C8884042154C4EA0053224D /* OTJoiningConfiguration.m in Sources */,
+                               0C0E60E020D033E400E654F2 /* OTControl.m in Sources */,

                                6CB420A52051FDD500FF2D44 /* LocalKeychainAnalytics.m in Sources */,
                                6CB420A52051FDD500FF2D44 /* LocalKeychainAnalytics.m in Sources */,

-                               0C8BBF141FCB4AFB00580909 /* OTControlProtocol.m in Sources */,

                                B61577E81F20151C004A3930 /* SecPaddingConfigurations.c in Sources */,
                                B61577E81F20151C004A3930 /* SecPaddingConfigurations.c in Sources */,

+                               DCA9D84721FFE7CF00B27421 /* EscrowRequestXPCProtocol.m in Sources */,

                                6C73F48B2006B83A003D5D63 /* SOSAnalytics.m in Sources */,
                                6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */,
                                6C73F48B2006B83A003D5D63 /* SOSAnalytics.m in Sources */,
                                6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */,

+                               5A7E037A22272E0E003DB3A0 /* SecProtocolHelper.m in Sources */,

                                6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */,
                                6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */,

-                               DC1789A21D779DF400B50D50 /* SecBreadcrumb.c in Sources */,
+                               78ADC62C1FA0FACE001EB8B6 /* SecProtocolTypes.m in Sources */,

                                6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */,

+                               0CD9E34623592EA7002995DE /* OctagonSignPosts.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC222C381E034D1F00B09171 /* Sources */ = {
+               DC311E712124B8A8002F5EAE /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCAE1DDE2073FDCD00B4F687 /* NSError+UsefulConstructors.m in Sources */,
-                               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 */,
-                               DC222C401E034D1F00B09171 /* SecDbItem.c in Sources */,
-                               DCCD88EB1E42622200F5AA71 /* CKKSGroupOperation.m 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 */,
-                               DCFB12C81E95A4C000510F5F /* CKKSCKAccountStateTracker.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 */,
-                               DC5BB4FB1E0C90DF0010F836 /* CKKSIncomingQueueOperation.m in Sources */,
-                               DC222C451E034D1F00B09171 /* CKKSIncomingQueueEntry.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 */,
-                               0C8BBEA21FC9DBAA00580909 /* OTContext.m in Sources */,
-                               DC222C4A1E034D1F00B09171 /* SecLogSettingsServer.m in Sources */,
-                               470D96741FCDE55B0065FE90 /* SecCDKeychain.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 */,
-                               4718AEE4205B3A060068EC3F /* KeychainModel.xcdatamodeld in Sources */,
-                               DC222C501E034D1F00B09171 /* SecOTRRemote.m in Sources */,
-                               47922D451FAA7C2E0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
-                               D491112E209515400066A1E4 /* 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 */,
-                               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 */,
-                               47FF17291FD60ACA00875565 /* SFKeychainServer.m in Sources */,
-                               DC7341F61F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */,
-                               DCBDB3B81E57C82300B61300 /* CKKSKeychainView.m in Sources */,
-                               DC222C5A1E034D1F00B09171 /* iCloudTrace.c in Sources */,
-                               DC5BB5011E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */,
-                               0C8BBEA01FC9DBA400580909 /* OTBottledPeer.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 */,
+                               DC311E7B2124B8EF002F5EAE /* aks_real_witness.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29719,55 +34968,65 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               6C53A447206AB1A6000FA611 /* LocalKeychainAnalytics.m in Sources */,

                                476541A61F33EE2700413F65 /* SecdWatchdog.m in Sources */,
                                476541A61F33EE2700413F65 /* SecdWatchdog.m in Sources */,

-                               6CAA8CF41F83E799007B6E03 /* SFSQLite.m in Sources */,
-                               4771ECCD1F17CD0E00840998 /* SFSQLiteStatement.m in Sources */,
+                               EBDE5E0E22BA3DE900A229C8 /* CKKSMockOctagonAdapter.m in Sources */,

                                DCD6C4B71EC5319600414FEE /* CKKSNearFutureSchedulerTests.m in Sources */,
                                DC08D1C41E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
                                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */,
                                6C588D7F1EAA14AA00D7E322 /* RateLimiterTests.m in Sources */,
                                DC4DB15F1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m in Sources */,
                                DC3502E71E0214C800BC0587 /* MockCloudKit.m in Sources */,
                                DCD6C4B71EC5319600414FEE /* CKKSNearFutureSchedulerTests.m in Sources */,
                                DC08D1C41E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
                                47E553741EDF674700749715 /* CKKSManifestTests.m in Sources */,
                                6C588D7F1EAA14AA00D7E322 /* RateLimiterTests.m in Sources */,
                                DC4DB15F1E2590B100CD6769 /* CKKSAESSIVEncryptionTests.m in Sources */,
                                DC3502E71E0214C800BC0587 /* MockCloudKit.m in Sources */,

-                               6CAA8D151F83ECD9007B6E03 /* SFAnalytics.m in Sources */,

                                DC6593D11ED8DAB900C19462 /* CKKSTests+CurrentPointerAPI.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 */,
                                DCAD9B491F8D95F200C5E2AE /* CloudKitKeychainSyncingFixupTests.m in Sources */,

+                               DC752F1A21C1B6A700216089 /* SFSQLiteStatement.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 */,
                                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 */,
                                DCBF2F7D1F90084D00ED0CA4 /* CKKSTLKSharingTests.m in Sources */,

+                               DC62DC6D22A87137000D2D5D /* CKKSTests+MultiZone.m in Sources */,

                                DCFABF8E20081E2F001128B5 /* CKKSDeviceStateUploadTests.m in Sources */,
                                DC3502B81E0208BE00BC0587 /* CKKSTests.m in Sources */,
                                6C3446301E24F6BE00F9522B /* CKKSRateLimiterTests.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 */,
+                               DCE7F2091F21726500DDB0F7 /* OctagonAPSReceiverTests.m in Sources */,

                                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */,
                                DC08D1CC1E64FCC5006237DA /* CKKSSOSTests.m in Sources */,
                                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */,
                                DC08D1CC1E64FCC5006237DA /* CKKSSOSTests.m in Sources */,

-                               6CDB5FF71FA78D2100410924 /* SFAnalyticsMultiSampler.m in Sources */,
-                               6CDF8DF11F96498300140B54 /* SFAnalyticsSampler.m in Sources */,
+                               0C98122821ACCC9300784441 /* OTClique.m in Sources */,

                                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */,
                                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */,

+                               EBB0315822223AAF007241CB /* CKKSLaunchSequenceTests.m in Sources */,
+                               DC752F1F21C1B98000216089 /* SFObjCType.m in Sources */,
+                               DC9C98C722E264F30021E29F /* CKKSFetchTests.m in Sources */,
+                               EB0E1ADA2357627F002B6037 /* CKKSPBFileStorageTests.m in Sources */,

                                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */,
                                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */,

+                               DC86122C2408AC190092E93B /* CKKSTests+ItemSyncChoice.m in Sources */,

                                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */,
                                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */,

+                               EBC1024422EBF93E0083D356 /* CKKSTests+LockStateTracker.m in Sources */,

                                DCB221561E8B08BF001598BC /* server_xpc.m in Sources */,
                                DCB221561E8B08BF001598BC /* server_xpc.m in Sources */,

-                               DC42690F1E82FD9C002B7110 /* server_security_helpers.c in Sources */,
+                               DCA9BC07221B7AFB00B4EB26 /* CKKSMockSOSPresentAdapter.m in Sources */,
+                               DC42690F1E82FD9C002B7110 /* server_security_helpers.m in Sources */,

                                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */,
                                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */,

+                               DC752F1921C1B69C00216089 /* SFSQLite.m in Sources */,

                                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */,
                                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */,

+                               DCBA6F2924105399009A5187 /* CKKSTests+ForwardCompatibility.m in Sources */,

                                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */,
                                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */,

-                               0C7756CD209A664800268D2C /* SFSignInAnalytics.m in Sources */,

                                DC5B391720C08B38005B09F6 /* SecFramework.c in Sources */,
                                DC5B391720C08B38005B09F6 /* SecFramework.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 */,
                                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 */,
+                               A6C737BB23F37AB00009C930 /* entitlements.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DC36895B21235F42003A3735 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB627A7F233E3C1600F32437 /* MockAKSRefKey.m in Sources */,
+                               DC5999752232FA3700A9F1A3 /* SecKeybagSupport.c in Sources */,
+                               DC36896221235F99003A3735 /* mockaks.m in Sources */,
+                               EB627A7E233E3C1300F32437 /* MockAKSOptionalParameters.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29783,112 +35042,196 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               1BB1CAB7232C05BD001D0C71 /* CuttlefishXPCWrapper.m in Sources */,
+                               DC6E02162405DE3900C61335 /* OTModifyUserControllableViewStatusOperation.m in Sources */,
+                               1BB1CAB8232C05BD001D0C71 /* CuttlefishXPCWrapper.h in Sources */,
+                               DCE0778021ADEC4B002662FD /* CKKSSerializedKey.m in Sources */,
+                               DCE0777F21ADEC07002662FD /* OTAccountMetadataClassC.m in Sources */,
+                               0C84D8351FCF43BB00B822E3 /* OTControlProtocol.m in Sources */,
+                               DCBFF833222611A200C5C044 /* OTFetchCKKSKeysOperation.m in Sources */,
+                               0C00FC86217A980100C8BF00 /* OTLocalCuttlefishReset.m in Sources */,

                                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */,
                                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */,

-                               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 */,
+                               6C4AEF88218A09E70012C5DA /* CheckV12DevEnabled.m in Sources */,
+                               DCC40B122383786D00402CB9 /* CKKSStates.m in Sources */,

                                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */,
                                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */,
                                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */,
                                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */,

-                               DCFB12C71E95A4C000510F5F /* CKKSCKAccountStateTracker.m in Sources */,
+                               DCD33D7C220B99CC000A390B /* EscrowRequestController.m in Sources */,
+                               DC19484D21812EC5007C2260 /* OTDeviceInformationAdapter.m in Sources */,
+                               6C4AEFA0218A189A0012C5DA /* SecAKSObjCWrappers.m in Sources */,
+                               DCFB12C71E95A4C000510F5F /* CKKSAccountStateTracker.m in Sources */,
+                               DCA9D84E21FFF04700B27421 /* EscrowRequestServer.m in Sources */,

                                470D96731FCDE55B0065FE90 /* SecCDKeychain.m in Sources */,
                                470D96731FCDE55B0065FE90 /* SecCDKeychain.m in Sources */,

+                               DCF94A7C222D9F2400C01744 /* OctagonCKKSPeerAdapter.m in Sources */,
+                               0CA7020A2280D5BD0085AC54 /* OTCheckHealthOperation.m in Sources */,

                                EBB407B31EBA46B200A541A5 /* CKKSPowerCollection.m in Sources */,
                                EBB407B31EBA46B200A541A5 /* CKKSPowerCollection.m in Sources */,

+                               0C84D8391FCF43CA00B822E3 /* OTManager.m in Sources */,

                                DCCD88EA1E42622200F5AA71 /* CKKSGroupOperation.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 */,
                                DC54DD0F1EA7D9E700108E92 /* CKKSManifestLeafRecord.m in Sources */,
                                DCDCCB901DF7B8D4006E840E /* CKKSItem.m in Sources */,
                                DC1ED8C11DD5197E002BDCFA /* CKKSItemEncrypter.m in Sources */,

+                               DCB55176247F48290009A859 /* CKKSDeleteCKZoneOperation.m in Sources */,
+                               0CDD6F79226E83F6009094C2 /* OTTriggerEscrowUpdateOperation.m in Sources */,
+                               DC0D16072363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m in Sources */,

                                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */,
                                DC378B3D1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m in Sources */,
                                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */,
                                DC378B3D1DF0CA7200A3DAFA /* CKKSIncomingQueueEntry.m in Sources */,

-                               0C8BBEA91FC9DBBF00580909 /* OTLocalStore.m in Sources */,
+                               6C880FCB21C3351400D38D66 /* SecDbBackupMetadataClassKey.m in Sources */,

                                4733377B1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */,
                                4733377B1FDAFBCC00E19F30 /* SFKeychainControlManager.m in Sources */,

-                               0CE1BCCE1FCE11680017230E /* OTBottledPeerSigned.m in Sources */,

                                DC5BB4FA1E0C90DE0010F836 /* CKKSIncomingQueueOperation.m in Sources */,
                                DC5BB5001E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */,
                                DC5BB4FA1E0C90DE0010F836 /* CKKSIncomingQueueOperation.m in Sources */,
                                DC5BB5001E0C98320010F836 /* CKKSOutgoingQueueOperation.m in Sources */,

+                               0CB8DC9A2194B14C0021A7C8 /* OTVouchWithBottleOperation.m in Sources */,
+                               DC5A01EA21BB428500D87AB9 /* CKKSTLKShare.m in Sources */,
+                               DC391F9E21BF2F8700772585 /* CKKSConstants.m in Sources */,
+                               EB7E911E2194849900B1FA21 /* SECC2MPGenericEventMetric.m in Sources */,

                                DC378B391DEFADB500A3DAFA /* CKKSZoneStateEntry.m in Sources */,
                                DC378B391DEFADB500A3DAFA /* CKKSZoneStateEntry.m in Sources */,

-                               526965D21E6E284400627F9D /* AsymKeybagBackup.m in Sources */,
+                               DCA9D83E21FFE51A00B27421 /* EscrowRequestXPCServer.m in Sources */,
+                               DCF46C30214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m in Sources */,
+                               EB7E911F2194849900B1FA21 /* SECC2MPGenericEventMetricValue.m in Sources */,
+                               6C880FC821C3351400D38D66 /* SecDbBackupBag.m in Sources */,
+                               0C87D3D9229326AA007853B5 /* OTEnsureOctagonKeyConsistency.m in Sources */,

                                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */,
                                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */,

+                               DCB55177247F483D0009A859 /* CKKSCreateCKZoneOperation.m in Sources */,
+                               DC8DF6DC212F8A7C007B3FE8 /* OTSOSAdapter.m in Sources */,
+                               0C66046A2134983900BFBBB8 /* OTEstablishOperation.m in Sources */,

                                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */,
                                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */,

+                               DC061A722462136F0026ADB3 /* CKKSOperationDependencies.m in Sources */,

                                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,
                                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,

-                               0C8BBF151FCB4B1B00580909 /* OTManager.m in Sources */,
-                               0C8BBEA51FC9DBB100580909 /* OTEscrowKeys.m in Sources */,
+                               DCC67E2F20DDC07900A70A31 /* OTPrepareOperation.m in Sources */,
+                               DCB41DFC216D5E5B00F219E0 /* OTAccountMetadataClassC+KeychainSupport.m in Sources */,
+                               6C880FCC21C3351400D38D66 /* SecDbBackupRecoverySet.m in Sources */,

                                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */,
                                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */,

+                               DC0D16022363A1D6007F0951 /* OTSetCDPBitOperation.m in Sources */,
+                               EB7E91212194849900B1FA21 /* SECC2MPMetric.m in Sources */,

                                DA6AA1651FE88AFB004565B0 /* CKKSControlServer.m in Sources */,
                                DCFE1C531F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */,
                                47922D481FAA7C3C0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */,
                                DCD6C4B41EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */,
                                DA6AA1651FE88AFB004565B0 /* CKKSControlServer.m in Sources */,
                                DCFE1C531F1825F7007640C8 /* CKKSUpdateDeviceStateOperation.m in Sources */,
                                47922D481FAA7C3C0008F7E0 /* SecDbKeychainSerializedMetadata.m in Sources */,
                                DCD6C4B41EC5302500414FEE /* CKKSNearFutureScheduler.m in Sources */,

+                               0C29BF222323288C003C807E /* OTDefines.m in Sources */,

                                DC378B2F1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m in Sources */,
                                DC378B2F1DEF9E0E00A3DAFA /* CKKSMirrorEntry.m in Sources */,

+                               DC5681AB224DA05F008F8DEB /* OctagonFlags.m in Sources */,
+                               0CD3D519224048A800024755 /* OTSetRecoveryKeyOperation.m in Sources */,

                                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */,
                                DC9FD32C1F85990A00C8AAC8 /* CKKSPeer.m in Sources */,
                                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */,
                                DC9FD32C1F85990A00C8AAC8 /* CKKSPeer.m in Sources */,

+                               EB7E911D2194849900B1FA21 /* SECC2MPGenericEvent.m in Sources */,
+                               6C880FCA21C3351400D38D66 /* SecDbBackupKeyClassSigningKey.m in Sources */,

                                DC1ED8C61DD55476002BDCFA /* CKKS.m in Sources */,
                                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */,
                                DC1ED8C61DD55476002BDCFA /* CKKS.m in Sources */,
                                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */,

+                               DC5F65AF2225C22C0051E9FA /* CKKSProvideKeySetOperation.m in Sources */,

                                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */,
                                DC52E7DF1D80BD8700B0A59C /* SOSChangeTracker.c in Sources */,
                                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */,
                                DC52E7DF1D80BD8700B0A59C /* SOSChangeTracker.c in Sources */,

+                               DCD33D94220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m in Sources */,
+                               DC947E8524638320005B8669 /* CKKSCheckKeyHierarchyOperation.m in Sources */,

                                DC1DA6681E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */,
                                DC1DA6681E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */,

+                               0CC8A9032123AF06005D7F6A /* OTJoinWithVoucherOperation.m in Sources */,
+                               DC061A71246213660026ADB3 /* CKKSLocalResetOperation.m in Sources */,

                                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */,
                                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */,

+                               DC45D43E22EB619D00CEB6B7 /* OctagonStateMachineObservers.m in Sources */,

                                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */,
                                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */,

+                               DC7250382296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m in Sources */,
+                               DC221BAC2267E2A70068DBCF /* OTUpdateTPHOperation.m in Sources */,
+                               DC93F02A22387A010072720A /* OTSOSUpdatePreapprovalsOperation.m in Sources */,
+                               DC880F68243D4CC00059806D /* CKKSLogging.m in Sources */,
+                               6C4AEF90218A0C170012C5DA /* SecDbBackupManager.m in Sources */,
+                               DC5060ED20E2D88300925005 /* OTCuttlefishContext.m in Sources */,
+                               DC0FA6B12291F63F00FE01C4 /* OctagonPendingFlag.m in Sources */,
+                               EB7E91202194849900B1FA21 /* SECC2MPInternalTestConfig.m in Sources */,
+                               DC4A76A3221267D4006F2D8F /* EscrowRequestServerHelpers.m in Sources */,
+                               0C1B8BB72233244F0094D5DA /* OTVouchWithRecoveryKeyOperation.m in Sources */,

                                DC52E7CF1D80BCFD00B0A59C /* SOSEngine.c in Sources */,
                                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */,
                                DCBDB3BD1E57CA7A00B61300 /* CKKSViewManager.m in Sources */,
                                DC52E7CF1D80BCFD00B0A59C /* SOSEngine.c in Sources */,
                                DC4DB1521E24692100CD6769 /* CKKSKey.m in Sources */,
                                DCBDB3BD1E57CA7A00B61300 /* CKKSViewManager.m in Sources */,

+                               1B5EAADD2252ABCD008D27E7 /* OTFetchViewsOperation.m in Sources */,

                                471A03EC1F72E35B000A8904 /* SecDbKeychainItemV7.m in Sources */,
                                471A03EC1F72E35B000A8904 /* SecDbKeychainItemV7.m in Sources */,

-                               0C8BBF171FCB4E5000580909 /* OTControlProtocol.m in Sources */,

                                EB4E0CDB1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */,
                                DC52E7C41D80BCAD00B0A59C /* SecDbItem.c in Sources */,
                                EB4E0CDB1FF36A9700CDCACC /* CKKSReachabilityTracker.m in Sources */,
                                DC52E7C41D80BCAD00B0A59C /* SecDbItem.c in Sources */,

+                               DCFC91B021F16E0B00E674DD /* OctagonStateMachine.m in Sources */,

                                DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.m in Sources */,
                                DC52E7D31D80BD1800B0A59C /* SecDbKeychainItem.m in Sources */,

+                               DC3AF52D2229E6C0006577E8 /* CKKSListenerCollection.m in Sources */,
+                               DC6DE89C213076C000C6B56D /* OTSOSUpgradeOperation.m in Sources */,

                                DC52E7CC1D80BCDF00B0A59C /* SecDbQuery.c in Sources */,
                                DC14478C1F5764C600236DB4 /* CKKSResultOperation.m in Sources */,
                                479DA1721EBBA8D10065C98F /* CKKSManifest.m in Sources */,
                                DC52E7CC1D80BCDF00B0A59C /* SecDbQuery.c in Sources */,
                                DC14478C1F5764C600236DB4 /* CKKSResultOperation.m in Sources */,
                                479DA1721EBBA8D10065C98F /* CKKSManifest.m in Sources */,

+                               DC1E5AB723063A4E00918162 /* CKKSPeerProvider.m in Sources */,

                                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */,
                                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */,

+                               0C2F337220DD64930031A92D /* OTRamping.m in Sources */,
+                               DCF12674218A757A000124C6 /* OTLeaveCliqueOperation.m in Sources */,
+                               FC63722F237B5D1C00973738 /* SecItemServer+SWC.m in Sources */,

                                DC52E7CD1D80BCE700B0A59C /* SecItemDataSource.c in Sources */,
                                DC52E7CD1D80BCE700B0A59C /* SecItemDataSource.c in Sources */,

+                               0C8FD52521483EF20098E3FB /* OT.m in Sources */,
+                               DC9C066B2149DFE400C6F7B8 /* OTAuthKitAdapter.m in Sources */,

                                DC124DCD20059BA900BE8DAC /* OctagonControlServer.m in Sources */,
                                DC52E7DE1D80BD7F00B0A59C /* SecItemDb.c in Sources */,
                                DC52E7E01D80BD8D00B0A59C /* SecItemSchema.c in Sources */,
                                EB10A3E820356E6500E84270 /* OTConstants.m 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 */,
                                DC52E7D71D80BD2D00B0A59C /* SecItemServer.c in Sources */,

-                               47922D441FAA7C2C0008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
+                               DCC54182225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m in Sources */,
+                               DC13A11D211D1982000A80BC /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,

                                4718AEE3205B3A050068EC3F /* KeychainModel.xcdatamodeld in Sources */,
                                4718AEE3205B3A050068EC3F /* KeychainModel.xcdatamodeld in Sources */,

+                               EB7E91152194846E00B1FA21 /* SecMetrics.m in Sources */,
+                               DC13A11E211D1982000A80BC /* NSOperationCategories.m in Sources */,

                                D491112C209515400066A1E4 /* CKKSAnalytics.m in Sources */,
                                D491112C209515400066A1E4 /* CKKSAnalytics.m in Sources */,

-                               0C8BBEE61FCA6E0500580909 /* OTContext.m in Sources */,
-                               DC1447981F5766D200236DB4 /* NSOperationCategories.m in Sources */,
+                               EB7E911C2194849900B1FA21 /* SECC2MPError.m in Sources */,

                                DCD8A0CF1E09EA1800E4FA0A /* SecKeybagSupport.c in Sources */,
                                DC52E7E11D80BD9300B0A59C /* SecLogSettingsServer.m in Sources */,
                                DCD8A0CF1E09EA1800E4FA0A /* SecKeybagSupport.c in Sources */,
                                DC52E7E11D80BD9300B0A59C /* SecLogSettingsServer.m in Sources */,

+                               DCAB17D62200D41200E1DFCF /* SecEscrowPendingRecord+KeychainSupport.m in Sources */,

                                DCFE1C291F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */,
                                DCFE1C291F17E455007640C8 /* CKKSDeviceStateEntry.m in Sources */,

+                               EB7E911A2194849900B1FA21 /* SECC2MPCloudKitOperationInfo.m in Sources */,
+                               0CC8A8FE2123A9F6005D7F6A /* OTClientVoucherOperation.m in Sources */,

                                DCAD9B461F8D939C00C5E2AE /* CKKSFixups.m in Sources */,
                                DCAD9B461F8D939C00C5E2AE /* CKKSFixups.m in Sources */,

-                               0C8BBEA71FC9DBB500580909 /* OTIdentity.m in Sources */,
+                               DCC67E1020DD7E0A00A70A31 /* OTStates.m in Sources */,
+                               DC8757F5218D2003000E65F1 /* OTRemovePeersOperation.m in Sources */,

                                DC52E7DC1D80BD4F00B0A59C /* SecOTRRemote.m in Sources */,
                                DC52E7DC1D80BD4F00B0A59C /* SecOTRRemote.m in Sources */,

+                               DCA9BC03221B721E00B4EB26 /* CKKSCloudKitClassDependencies.m in Sources */,
+                               EB7E91182194849900B1FA21 /* SECC2MPCloudKitInfo.m in Sources */,

                                DCE278EA1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                DCD662F71E329B6800188186 /* CKKSNewTLKOperation.m in Sources */,
                                DCE278EA1ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.m in Sources */,
                                DCD662F71E329B6800188186 /* CKKSNewTLKOperation.m in Sources */,

+                               DCB946B022FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m in Sources */,
+                               DCE772672290712F005862B4 /* OctagonCheckTrustStateOperation.m in Sources */,
+                               5A04BAF822973E7F001848A0 /* OTFollowup.m in Sources */,

                                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */,
                                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */,

-                               0CE407AC1FD4769B00F59B31 /* OTCloudStoreState.m in Sources */,
+                               EB80DE162195EDA4005B10FA /* SecC2DeviceInfo.m in Sources */,

                                47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,
                                47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,

+                               6C6AF180221A070A0091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */,

                                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */,
                                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */,

+                               0C4F4DE221153E9E007F7E20 /* OTEpochOperation.m in Sources */,

                                47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */,
                                47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */,

-                               0CCCC7C920261D310024405E /* OT.m in Sources */,
+                               EB0E1ACB2353A702002B6037 /* CKKSPBFileStorage.m in Sources */,

                                DC7A17EF1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */,
                                DC7A17EF1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m in Sources */,

-                               DC7341F51F8447AB00AB9BDF /* CKKSTLKShare.m in Sources */,
+                               DC7341F51F8447AB00AB9BDF /* CKKSTLKShareRecord.m in Sources */,

                                0C5960811FB369C50095BA29 /* CKKSHealTLKSharesOperation.m in Sources */,
                                0C5960811FB369C50095BA29 /* CKKSHealTLKSharesOperation.m in Sources */,

+                               DCD33D81220B9DC8000A390B /* OctagonStateMachineHelpers.m in Sources */,

                                DCA4D2171E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */,
                                5269658D1E6A154700627F9D /* SecBackupKeybagEntry.m in Sources */,
                                DC52E7D41D80BD1D00B0A59C /* iCloudTrace.c 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 */,
+                               EB7E91222194849900B1FA21 /* SECC2MPNetworkEvent.m in Sources */,
+                               0C66047E2134CA5600BFBBB8 /* OTDeviceInformation.m in Sources */,
+                               DCEA5D871E2F14810089CF55 /* OctagonAPSReceiver.m in Sources */,
+                               DC0BD4F521BB060F006B9154 /* CKKSKeychainBackedKey.m in Sources */,
+                               6C880FC921C3351400D38D66 /* SecDbBackupBagIdentity.m in Sources */,

                                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */,
                                6C869A751F50CAF400957298 /* SOSEnsureBackup.m in Sources */,

-                               BE2AD2BA1FDA080800739F96 /* OTBottledPeerRecord.m in Sources */,
-                               0C770EC41FCF7E2000B5F0E2 /* OTCloudStore.m in Sources */,
+                               DC754C722228B57C00A39C8E /* TrustedPeersHelperProtocol.m in Sources */,
+                               0C12B1F12138D31600BE0A98 /* OTClientStateMachine.m in Sources */,

                                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */,
                                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */,

-                               0C36B3212007F2550029F7A2 /* OTPreflightInfo.m in Sources */,
-                               BEE4B1941FFD604B00777D39 /* OTAuthenticatedCiphertext+SF.m in Sources */,
+                               EB7E911B2194849900B1FA21 /* SECC2MPDeviceInfo.m in Sources */,
+                               EB7E91192194849900B1FA21 /* SECC2MPCloudKitOperationGroupInfo.m in Sources */,

                                DC9082C41EA0277600D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */,
                                DC9082C41EA0277600D0C1C5 /* CKKSZoneChangeFetcher.m in Sources */,

+                               6C4AEF96218A127F0012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */,

                                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */,
                                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */,

-                               DCEA5D971E3015830089CF55 /* CKKSZone.m in Sources */,
+                               EB7E91172194847A00B1FA21 /* SecEventMetric.m in Sources */,
+                               0C64C0802485B2EF00D84A5D /* OTPreloadOctagonKeysOperation.m in Sources */,
+                               DCAB17D22200D26900E1DFCF /* SecEscrowPendingRecord.m in Sources */,
+                               DC047082218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m in Sources */,
+                               DC047088218BCEF20078BDAA /* OTOperationDependencies.m in Sources */,
+                               EB7E91232194849900B1FA21 /* SECC2MPServerInfo.m in Sources */,
+                               DC614C5222A9BDB500E16ADA /* CKKSZoneModifier.m in Sources */,

                                47FF17281FD60ACA00875565 /* SFKeychainServer.m in Sources */,
                                47FF17281FD60ACA00875565 /* SFKeychainServer.m in Sources */,

-                               BEE4B19A1FFDAFE600777D39 /* SFECPublicKey+SPKI.m in Sources */,

                                DC52E7C51D80BCB300B0A59C /* swcagent_client.c in Sources */,
                                DC52E7C51D80BCB300B0A59C /* swcagent_client.c in Sources */,

+                               DC7F79BB22EA5C73001FB69A /* OTLocalCKKSResetOperation.m in Sources */,
+                               DCD33D8F220CEED2000A390B /* EscrowRequestInformCloudServicesOperation.m in Sources */,
+                               EBB02A702220ED26007241CB /* CKKSLaunchSequence.m in Sources */,
+                               DCFF82762162876400D54B02 /* OTResetOperation.m in Sources */,
+                               DAEF8E5C22581CDF00F7DF79 /* OTPairingClient.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29896,16 +35239,20 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               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 */,
                                DC52E8F11D80C34000B0A59C /* SOSAccount.m in Sources */,
                                DC52E8F31D80C34000B0A59C /* SOSAccountBackup.m in Sources */,
                                DCB332591F478C3C00178C30 /* SOSUserKeygen.m in Sources */,
                                DC52E8F41D80C34000B0A59C /* SOSAccountCircles.m in Sources */,

+                               DC59245220E46FAA0073D284 /* SOSRingBackup.m in Sources */,

                                0CD8CB0B1ECA50920076F37F /* SOSPeerOTRTimer.m in Sources */,
                                DC2670F51F3E711400816EED /* SOSAccountCloudParameters.m in Sources */,
                                DCDCC7E51D9B5526006487E8 /* SOSAccountSync.m in Sources */,
                                DC2670F81F3E723B00816EED /* SOSAccountDer.m in Sources */,
                                0CD8CB0B1ECA50920076F37F /* SOSPeerOTRTimer.m in Sources */,
                                DC2670F51F3E711400816EED /* SOSAccountCloudParameters.m in Sources */,
                                DCDCC7E51D9B5526006487E8 /* SOSAccountSync.m in Sources */,
                                DC2670F81F3E723B00816EED /* SOSAccountDer.m in Sources */,

+                               EB0E1B942358FAF3002B6037 /* SOSAccountConfiguration.m in Sources */,
+                               DC59245520E470070073D284 /* SOSRingRecovery.m in Sources */,

                                DC52E8F71D80C34000B0A59C /* SOSAccountCredentials.m in Sources */,
                                DC52E8F71D80C34000B0A59C /* SOSAccountCredentials.m in Sources */,

+                               DC59245420E46FDE0073D284 /* SOSRingBasic.m in Sources */,
+                               EB3210CD20F532F3003504F7 /* SOSAccountTrustClassic+Retirement.m in Sources */,

                                DC52E8F91D80C34000B0A59C /* SOSAccountFullPeerInfo.m in Sources */,
                                DC52E8FC1D80C34000B0A59C /* SOSAccountLog.m in Sources */,
                                DC52E8FA1D80C34000B0A59C /* SOSAccountPeers.m in Sources */,
                                DC52E8F91D80C34000B0A59C /* SOSAccountFullPeerInfo.m in Sources */,
                                DC52E8FC1D80C34000B0A59C /* SOSAccountLog.m in Sources */,
                                DC52E8FA1D80C34000B0A59C /* SOSAccountPeers.m in Sources */,


@@ -29918,65 +35265,38 @@
                                0CB50A0D20AA486800FE4675 /* SOSAccountTrustClassic+Expansion.m in Sources */,
                                DC52E9011D80C34000B0A59C /* SOSBackupEvent.c in Sources */,
                                DC2670F71F3E721800816EED /* SOSAccountTrustClassic.m in Sources */,
                                0CB50A0D20AA486800FE4675 /* SOSAccountTrustClassic+Expansion.m in Sources */,
                                DC52E9011D80C34000B0A59C /* SOSBackupEvent.c in Sources */,
                                DC2670F71F3E721800816EED /* SOSAccountTrustClassic.m in Sources */,

+                               DC59245820E4711F0073D284 /* SOSRingDER.c in Sources */,

                                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */,
                                0C4899121E0E105D00C6CF70 /* SOSTransportCircleCK.m in Sources */,
                                DC52E8DD1D80C31F00B0A59C /* SOSCoder.c in Sources */,
                                DC52E8DE1D80C31F00B0A59C /* SOSDigestVector.c in Sources */,
                                DC52E8E01D80C31F00B0A59C /* SOSManifest.c in Sources */,
                                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */,
                                0C4899121E0E105D00C6CF70 /* SOSTransportCircleCK.m in Sources */,
                                DC52E8DD1D80C31F00B0A59C /* SOSCoder.c in Sources */,
                                DC52E8DE1D80C31F00B0A59C /* SOSDigestVector.c in Sources */,
                                DC52E8E01D80C31F00B0A59C /* SOSManifest.c in Sources */,

+                               DC59244C20E46EDD0073D284 /* SOSRingTypes.m in Sources */,
+                               DC59244F20E46F470073D284 /* SOSAccountRecovery.m in Sources */,

                                DC52E8E11D80C31F00B0A59C /* SOSMessage.c in Sources */,
                                DC52E8E11D80C31F00B0A59C /* SOSMessage.c in Sources */,

+                               480C03DB2145A8490034570E /* SOSTrustedDeviceAttributes.m in Sources */,

                                DC52E8E21D80C31F00B0A59C /* SOSPeer.m in Sources */,
                                DC52E8E31D80C31F00B0A59C /* SOSPeerCoder.m in Sources */,
                                DCFAEDCF1D999859005187E4 /* SOSAccountGhost.m in Sources */,
                                DC52E8E21D80C31F00B0A59C /* SOSPeer.m in Sources */,
                                DC52E8E31D80C31F00B0A59C /* SOSPeerCoder.m in Sources */,
                                DCFAEDCF1D999859005187E4 /* SOSAccountGhost.m in Sources */,

+                               DC59245620E470350073D284 /* SOSRingConcordanceTrust.c in Sources */,

                                EB6928F91D9ED5BA00062A18 /* SecRecoveryKey.m in Sources */,
                                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */,
                                EB6928F91D9ED5BA00062A18 /* SecRecoveryKey.m in Sources */,
                                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */,

-                               48776C811DA5BC0E00CC09B9 /* SOSAccountRecovery.m in Sources */,
+                               DC59244D20E46F0E0073D284 /* SOSTransport.m in Sources */,

                                DC52E8C91D80C2FD00B0A59C /* SOSTransportBackupPeer.m in Sources */,
                                DC52E8C91D80C2FD00B0A59C /* SOSTransportBackupPeer.m in Sources */,

+                               DC59245020E46F800073D284 /* SOSRecoveryKeyBag.m in Sources */,
+                               48AC7B73232B1DA600F02B6F /* SOSIntervalEvent.m in Sources */,

                                0CB50A0E20AA4C2F00FE4675 /* SOSAccountTrustClassic+Circle.m in Sources */,
                                DC52E8CA1D80C2FD00B0A59C /* SOSTransportCircle.m in Sources */,
                                DC52E8CB1D80C2FD00B0A59C /* SOSTransportCircleKVS.m in Sources */,
                                DC52E8CC1D80C2FD00B0A59C /* SOSTransportKeyParameter.m in Sources */,
                                0CB50A0E20AA4C2F00FE4675 /* SOSAccountTrustClassic+Circle.m in Sources */,
                                DC52E8CA1D80C2FD00B0A59C /* SOSTransportCircle.m in Sources */,
                                DC52E8CB1D80C2FD00B0A59C /* SOSTransportCircleKVS.m in Sources */,
                                DC52E8CC1D80C2FD00B0A59C /* SOSTransportKeyParameter.m in Sources */,

+                               DC2FA72A20E57BFD00DB7518 /* SOSAccountTrust.m in Sources */,

                                DC52E8CE1D80C2FD00B0A59C /* SOSTransportMessage.m in Sources */,
                                0CAD1E1C1E032ADB00537693 /* SOSCloudCircleServer.m in Sources */,
                                0CAC5DBF1EB3DA4C00AD884B /* SOSPeerRateLimiter.m in Sources */,
                                DC52E8CE1D80C2FD00B0A59C /* SOSTransportMessage.m in Sources */,
                                0CAD1E1C1E032ADB00537693 /* SOSCloudCircleServer.m in Sources */,
                                0CAC5DBF1EB3DA4C00AD884B /* SOSPeerRateLimiter.m in Sources */,

+                               DC59244A20E46E9D0073D284 /* SOSRingUtils.c in Sources */,

                                DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */,
                                DC52E8D01D80C2FD00B0A59C /* SOSTransportMessageKVS.m in Sources */,
                                DAB27AE11FA29EE300DEBBDE /* SOSControlServer.m in Sources */,
                                DC52E8D01D80C2FD00B0A59C /* SOSTransportMessageKVS.m in Sources */,

-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC52EA451D80CB7000B0A59C /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC52EAA21D80CCB200B0A59C /* keychain_backup.c in Sources */,
-                               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 */,
-                               DC52EA9D1D80CC9700B0A59C /* syncbubble.m in Sources */,
-                               DC52EBC31D80CEBA00B0A59C /* print_cert.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               DC52EBC71D80CEF100B0A59C /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       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 */,
-                               DC52EC1A1D80CF5100B0A59C /* keychain_add.c in Sources */,
-                               DC52EC191D80CF4C00B0A59C /* keychain_find.m in Sources */,
-                               DC52EC181D80CF4700B0A59C /* log_control.c in Sources */,
-                               DC52EC171D80CF4200B0A59C /* pkcs12_util.c in Sources */,
-                               D484A1072167D707008653A9 /* ct_exceptions.m in Sources */,
-                               DC52EC161D80CF3B00B0A59C /* scep.c in Sources */,
-                               DC52EC151D80CF0B00B0A59C /* show_certificates.c in Sources */,
-                               DC52EC141D80CF0500B0A59C /* spc.c in Sources */,
+                               EB3210C720F532CD003504F7 /* SOSAccountTrustClassic+Identity.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -29986,14 +35306,11 @@
                        files = (
                                DCD7EE841F4E46F9007D9804 /* accountCirclesViewsPrint.m in Sources */,
                                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */,
                        files = (
                                DCD7EE841F4E46F9007D9804 /* accountCirclesViewsPrint.m in Sources */,
                                0C0CECA41DA45ED700C22FBC /* recovery_key.m in Sources */,

-                               DC52EC3B1D80CFE900B0A59C /* syncbackup.m in Sources */,

                                DC52EC3A1D80CFE400B0A59C /* keychain_log.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 */,
                                DC52EC3A1D80CFE400B0A59C /* keychain_log.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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30023,7 +35340,6 @@
                                DC52EC791D80D14D00B0A59C /* sc-45-digestvector.c in Sources */,
                                DC52EC781D80D14800B0A59C /* SOSRegressionUtilities.m in Sources */,
                                DC52EC771D80D14400B0A59C /* sc-130-resignationticket.c in Sources */,
                                DC52EC791D80D14D00B0A59C /* sc-45-digestvector.c in Sources */,
                                DC52EC781D80D14800B0A59C /* SOSRegressionUtilities.m in Sources */,
                                DC52EC771D80D14400B0A59C /* sc-130-resignationticket.c in Sources */,

-                               DC52EC761D80D13F00B0A59C /* sc-150-ring.m in Sources */,

                                DC52EC751D80D13B00B0A59C /* sc-42-circlegencount.c in Sources */,
                                DC52EC741D80D13500B0A59C /* SOSTestDataSource.c in Sources */,
                                DC52EC731D80D12E00B0A59C /* sc-20-keynames.m in Sources */,
                                DC52EC751D80D13B00B0A59C /* sc-42-circlegencount.c in Sources */,
                                DC52EC741D80D13500B0A59C /* SOSTestDataSource.c in Sources */,
                                DC52EC731D80D12E00B0A59C /* sc-20-keynames.m in Sources */,


@@ -30092,7 +35408,6 @@
                        files = (
                                DC52EDA01D80D4F700B0A59C /* sd-10-policytree.m in Sources */,
                                DC52ED9F1D80D4F200B0A59C /* SOSTransportTestTransports.m in Sources */,
                        files = (
                                DC52EDA01D80D4F700B0A59C /* sd-10-policytree.m in Sources */,
                                DC52ED9F1D80D4F200B0A59C /* SOSTransportTestTransports.m in Sources */,

-                               DC52ED9E1D80D4ED00B0A59C /* secd-95-escrow-persistence.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30114,7 +35429,6 @@
                                DC52EDF51D80D62E00B0A59C /* SecdTestKeychainUtilities.c in Sources */,
                                DC52EDF61D80D62E00B0A59C /* SOSTransportTestTransports.m in Sources */,
                                EB9C02481E8A15B40040D3C6 /* secd-37-pairing-initial-sync.m in Sources */,
                                DC52EDF51D80D62E00B0A59C /* SecdTestKeychainUtilities.c in Sources */,
                                DC52EDF61D80D62E00B0A59C /* SOSTransportTestTransports.m in Sources */,
                                EB9C02481E8A15B40040D3C6 /* secd-37-pairing-initial-sync.m in Sources */,

-                               0CAD1E5E1E1C5D0600537693 /* secd-95-escrow-persistence.m in Sources */,

                                DC52EDB51D80D5C500B0A59C /* secd-03-corrupted-items.m in Sources */,
                                0CAD1E5D1E1C5CF900537693 /* secd-80-views-alwayson.m in Sources */,
                                DC52EDB61D80D5C500B0A59C /* secd-04-corrupted-items.m in Sources */,
                                DC52EDB51D80D5C500B0A59C /* secd-03-corrupted-items.m in Sources */,
                                0CAD1E5D1E1C5CF900537693 /* secd-80-views-alwayson.m in Sources */,
                                DC52EDB61D80D5C500B0A59C /* secd-04-corrupted-items.m in Sources */,


@@ -30123,9 +35437,7 @@
                                DC52EDBC1D80D5C500B0A59C /* secd-02-upgrade-while-locked.m in Sources */,
                                DC52EDBD1D80D5C500B0A59C /* secd-20-keychain_upgrade.m in Sources */,
                                DC52EDBE1D80D5C500B0A59C /* secd-21-transmogrify.m in Sources */,
                                DC52EDBC1D80D5C500B0A59C /* secd-02-upgrade-while-locked.m in Sources */,
                                DC52EDBD1D80D5C500B0A59C /* secd-20-keychain_upgrade.m in Sources */,
                                DC52EDBE1D80D5C500B0A59C /* secd-21-transmogrify.m in Sources */,

-                               DCFAEDD21D99991F005187E4 /* secd-668-ghosts.m in Sources */,

                                DC52EDBF1D80D5C500B0A59C /* secd-30-keychain-upgrade.m in Sources */,
                                DC52EDBF1D80D5C500B0A59C /* secd-30-keychain-upgrade.m in Sources */,

-                               DC52EDC01D80D5C500B0A59C /* secd-31-keychain-bad.m in Sources */,

                                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */,
                                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */,
                                DC52EDC21D80D5C500B0A59C /* secd-32-restore-bad-backup.m in Sources */,
                                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */,
                                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */,
                                DC52EDC21D80D5C500B0A59C /* secd-32-restore-bad-backup.m in Sources */,


@@ -30148,6 +35460,7 @@
                                DC52EDD11D80D5C500B0A59C /* secd-57-1-account-last-standing.m in Sources */,
                                DC52EDD21D80D5C500B0A59C /* secd-58-password-change.m in Sources */,
                                DC52EDD31D80D5C500B0A59C /* secd-59-account-cleanup.m in Sources */,
                                DC52EDD11D80D5C500B0A59C /* secd-57-1-account-last-standing.m in Sources */,
                                DC52EDD21D80D5C500B0A59C /* secd-58-password-change.m in Sources */,
                                DC52EDD31D80D5C500B0A59C /* secd-59-account-cleanup.m in Sources */,

+                               EB351540211A79E30097A87C /* secd-33-keychain-backup.m in Sources */,

                                DC52EDD41D80D5C500B0A59C /* secd-60-account-cloud-identity.m in Sources */,
                                DC52EDD51D80D5C500B0A59C /* secd60-account-cloud-exposure.m in Sources */,
                                DC52EDD61D80D5C500B0A59C /* secd-61-account-leave-not-in-kansas-anymore.m in Sources */,
                                DC52EDD41D80D5C500B0A59C /* secd-60-account-cloud-identity.m in Sources */,
                                DC52EDD51D80D5C500B0A59C /* secd60-account-cloud-exposure.m in Sources */,
                                DC52EDD61D80D5C500B0A59C /* secd-61-account-leave-not-in-kansas-anymore.m in Sources */,


@@ -30166,6 +35479,7 @@
                                DC52EDDF1D80D5C500B0A59C /* secd-70-otr-remote.m in Sources */,
                                DC52EDE21D80D5C500B0A59C /* secd-74-engine-beer-servers.m in Sources */,
                                7281E0901DFD0E0A0021E1B7 /* CKDKVSProxy.m in Sources */,
                                DC52EDDF1D80D5C500B0A59C /* secd-70-otr-remote.m in Sources */,
                                DC52EDE21D80D5C500B0A59C /* secd-74-engine-beer-servers.m in Sources */,
                                7281E0901DFD0E0A0021E1B7 /* CKDKVSProxy.m in Sources */,

+                               487A65F4245B65F1005F51D6 /* secd-68-fullPeerInfoIntegrity.m in Sources */,

                                DC52EDE31D80D5C500B0A59C /* secd-75-engine-views.m in Sources */,
                                DC52EDE61D80D5C500B0A59C /* secd-80-views-basic.m in Sources */,
                                DC52EDE81D80D5C500B0A59C /* secd-81-item-acl-stress.m in Sources */,
                                DC52EDE31D80D5C500B0A59C /* secd-75-engine-views.m in Sources */,
                                DC52EDE61D80D5C500B0A59C /* secd-80-views-basic.m in Sources */,
                                DC52EDE81D80D5C500B0A59C /* secd-81-item-acl-stress.m in Sources */,


@@ -30185,57 +35499,39 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC52EE611D80D79E00B0A59C /* si-71-mobile-store-policy.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                DC52EE611D80D79E00B0A59C /* si-71-mobile-store-policy.c in Sources */,

-                               DC52EE601D80D79900B0A59C /* si-74-OTAPKISigner.c in Sources */,

                                D4AD87701E452CE000CA1B7F /* si-68-secmatchissuer.c in Sources */,
                                EB6928CA1D9C9E1800062A18 /* rk_01_recoverykey.m in Sources */,
                                D42CDC351DC12FE90090E2C9 /* si-66-smime.c in Sources */,
                                D4AD87701E452CE000CA1B7F /* si-68-secmatchissuer.c in Sources */,
                                EB6928CA1D9C9E1800062A18 /* rk_01_recoverykey.m in Sources */,
                                D42CDC351DC12FE90090E2C9 /* si-66-smime.c in Sources */,

-                               DC52EE5F1D80D79400B0A59C /* si-85-sectrust-ssl-policy.c in Sources */,
-                               D4AA64891E9727EB00D317ED /* si-18-certificate-parse.m in Sources */,

                                B61577F41F20513C004A3930 /* padding-00-mmcs.c in Sources */,
                                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */,
                                B61577F41F20513C004A3930 /* padding-00-mmcs.c in Sources */,
                                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */,

-                               DC52EE5E1D80D78C00B0A59C /* si-82-sectrust-ct.m in Sources */,
-                               DC52EE5D1D80D76B00B0A59C /* si-87-sectrust-name-constraints.m in Sources */,

                                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */,
                                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */,

-                               DC52EE5C1D80D76300B0A59C /* si-20-sectrust-policies.m in Sources */,
-                               DC52EE511D80D73800B0A59C /* si-15-certificate.c in Sources */,

                                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */,
                                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */,

-                               BE6215BE1DB6E69100961E15 /* si-84-sectrust-allowlist.m in Sources */,
-                               DC52EE521D80D73800B0A59C /* si-16-ec-certificate.c in Sources */,
-                               DC52EE421D80D71900B0A59C /* si-20-sectrust.c in Sources */,

                                D4B6D57C2069D8450099FBEF /* si-34-cms-timestamp.m in Sources */,
                                D4096E031ED5F21C000AC459 /* si-65-cms-cert-policy.c in Sources */,
                                DC52EE441D80D71900B0A59C /* si-21-sectrust-asr.c in Sources */,
                                D4B6D57C2069D8450099FBEF /* si-34-cms-timestamp.m in Sources */,
                                D4096E031ED5F21C000AC459 /* si-65-cms-cert-policy.c in Sources */,
                                DC52EE441D80D71900B0A59C /* si-21-sectrust-asr.c in Sources */,

+                               D4AA0D9A22FB959600D77FA4 /* si-29-cms-chain-mode.m in Sources */,

                                DC52EE451D80D71900B0A59C /* si-22-sectrust-iap.c in Sources */,
                                DC52EE451D80D71900B0A59C /* si-22-sectrust-iap.c in Sources */,

-                               DC52EE471D80D71900B0A59C /* si-23-sectrust-ocsp.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 */,
                                DCE2341820A3D4B8009766A3 /* si-cms-hash-agility-data.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 */,
                                DCE2341820A3D4B8009766A3 /* si-cms-hash-agility-data.c in Sources */,

-                               DC52EE4B1D80D71900B0A59C /* si-24-sectrust-nist.c in Sources */,

                                DC52EE4C1D80D71900B0A59C /* si-24-sectrust-passbook.c in Sources */,
                                DC52EE4D1D80D71900B0A59C /* si-26-sectrust-copyproperties.c in Sources */,
                                5E7793751E5F025A0074A2D1 /* si-44-seckey-aks.m in Sources */,
                                DC52EE4C1D80D71900B0A59C /* si-24-sectrust-passbook.c in Sources */,
                                DC52EE4D1D80D71900B0A59C /* si-26-sectrust-copyproperties.c in Sources */,
                                5E7793751E5F025A0074A2D1 /* si-44-seckey-aks.m in Sources */,

-                               DC52EE4E1D80D71900B0A59C /* si-27-sectrust-exceptions.c in Sources */,
-                               DC52EE4F1D80D71900B0A59C /* si-28-sectrustsettings.m in Sources */,

                                DC52EE531D80D73800B0A59C /* si-44-seckey-gen.m in Sources */,
                                DC52EE541D80D73800B0A59C /* si-44-seckey-rsa.m in Sources */,
                                DC52EE551D80D73800B0A59C /* si-44-seckey-ec.m in Sources */,
                                D4096E011ED5F0B5000AC459 /* si-60-cms.c in Sources */,
                                D4CFAA7E1E660BB3004746AA /* si-32-sectrust-pinning-required.m in Sources */,
                                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.m in Sources */,
                                DC52EE531D80D73800B0A59C /* si-44-seckey-gen.m in Sources */,
                                DC52EE541D80D73800B0A59C /* si-44-seckey-rsa.m in Sources */,
                                DC52EE551D80D73800B0A59C /* si-44-seckey-ec.m in Sources */,
                                D4096E011ED5F0B5000AC459 /* si-60-cms.c in Sources */,
                                D4CFAA7E1E660BB3004746AA /* si-32-sectrust-pinning-required.m in Sources */,
                                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.m in Sources */,

-                               D487FBB81DB8357300D4BB0B /* si-29-sectrust-sha1-deprecation.m in Sources */,

                                DC52EE561D80D73800B0A59C /* si-44-seckey-ies.m in Sources */,
                                DC52EE561D80D73800B0A59C /* si-44-seckey-ies.m in Sources */,

-                               DC52EE571D80D73800B0A59C /* si-67-sectrust-blocklist.c in Sources */,

                                D4096E021ED5F207000AC459 /* si-64-ossl-cms.c in Sources */,
                                D4096E021ED5F207000AC459 /* si-64-ossl-cms.c in Sources */,

-                               09A3B9E11F82734400C5C324 /* si-44-seckey-proxy.m in Sources */,
+                               478014541FBF577000C4043D /* si-44-seckey-proxy.m in Sources */,

                                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */,
                                DC52EE581D80D73800B0A59C /* si-70-sectrust-unified.c in Sources */,
                                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */,
                                DC52EE581D80D73800B0A59C /* si-70-sectrust-unified.c in Sources */,

-                               DC52EE591D80D73800B0A59C /* si-82-seccertificate-ct.c in Sources */,

                                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.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 */,
                                D47E69401E92F75D002C8CF6 /* si-61-pkcs12.c in Sources */,

-                               BEB9E9EC1FFF195C00676593 /* si-88-sectrust-valid.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30245,20 +35541,23 @@
                        files = (
                                EB78D3F91E600E93009AFE05 /* SOSCloudCircle.m in Sources */,
                                DC52EE7C1D80D89E00B0A59C /* SecItemBackup.c in Sources */,
                        files = (
                                EB78D3F91E600E93009AFE05 /* SOSCloudCircle.m in Sources */,
                                DC52EE7C1D80D89E00B0A59C /* SecItemBackup.c in Sources */,

+                               5F00F9562306146700B832E0 /* p12import.c in Sources */,

                                DC4269051E82EDC4002B7110 /* SecItem.m in Sources */,
                                DC4269051E82EDC4002B7110 /* SecItem.m in Sources */,

-                               EBEEEE3E1EA31DB100E15F5C /* SOSControlHelper.m in Sources */,
+                               5F00F9582306147100B832E0 /* p12pbegen.c in Sources */,
+                               5F00F9592306147A00B832E0 /* SecImportExport.c in Sources */,

                                DC52EE7B1D80D89900B0A59C /* SecKeyAdaptors.m in Sources */,
                                DC52EE7A1D80D89400B0A59C /* SecCFAllocator.c in Sources */,
                                DC52EE791D80D88D00B0A59C /* SecItem.c in Sources */,
                                DC52EE781D80D88800B0A59C /* SecRSAKey.c in Sources */,
                                DC52EE7B1D80D89900B0A59C /* SecKeyAdaptors.m in Sources */,
                                DC52EE7A1D80D89400B0A59C /* SecCFAllocator.c in Sources */,
                                DC52EE791D80D88D00B0A59C /* SecItem.c in Sources */,
                                DC52EE781D80D88800B0A59C /* SecRSAKey.c in Sources */,

-                               09A3B9E21F838A3400C5C324 /* SecKeyProxy.m in Sources */,
+                               478014701FBF5BD800C4043D /* SecKeyProxy.m in Sources */,

                                DC52EE771D80D88300B0A59C /* SecDH.c in Sources */,
                                DC52EE761D80D87F00B0A59C /* SecCTKKey.m in Sources */,
                                DC52EE741D80D86F00B0A59C /* SecAccessControl.m in Sources */,
                                DC52EE771D80D88300B0A59C /* SecDH.c in Sources */,
                                DC52EE761D80D87F00B0A59C /* SecCTKKey.m in Sources */,
                                DC52EE741D80D86F00B0A59C /* SecAccessControl.m in Sources */,

-                               DC52EE731D80D86800B0A59C /* SecKey.c in Sources */,
+                               DC52EE731D80D86800B0A59C /* SecKey.m in Sources */,

                                DC52EE721D80D86400B0A59C /* SecuritydXPC.c in Sources */,
                                DC52EE711D80D85F00B0A59C /* SecECKey.m in Sources */,
                                DC52EE701D80D84700B0A59C /* SecItemConstants.c in Sources */,
                                DC52EE721D80D86400B0A59C /* SecuritydXPC.c in Sources */,
                                DC52EE711D80D85F00B0A59C /* SecECKey.m in Sources */,
                                DC52EE701D80D84700B0A59C /* SecItemConstants.c in Sources */,

+                               6C22008A244F0760000A4557 /* SecItemRateLimit.m in Sources */,

                                DC52EE6F1D80D83F00B0A59C /* SecPasswordGenerate.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DC52EE6F1D80D83F00B0A59C /* SecPasswordGenerate.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -30306,11 +35605,12 @@
                                DC5ABDE71D832E4000CF422C /* trusted_cert_utils.c in Sources */,
                                DC5ABDE81D832E4000CF422C /* trust_settings_impexp.c in Sources */,
                                DC5ABDE91D832E4000CF422C /* user_trust_enable.cpp in Sources */,
                                DC5ABDE71D832E4000CF422C /* trusted_cert_utils.c in Sources */,
                                DC5ABDE81D832E4000CF422C /* trust_settings_impexp.c in Sources */,
                                DC5ABDE91D832E4000CF422C /* user_trust_enable.cpp in Sources */,

+                               F9F77E98223C2F9A00E5CBF6 /* requirement.c in Sources */,

                                DC5ABDEA1D832E4000CF422C /* authz.c in Sources */,
                                DC5ABDEB1D832E4000CF422C /* verify_cert.c in Sources */,
                                DC5ABDEA1D832E4000CF422C /* authz.c in Sources */,
                                DC5ABDEB1D832E4000CF422C /* verify_cert.c in Sources */,

+                               BE64A80022AF010B001209F3 /* trusted_cert_ssl.m in Sources */,

                                DC5ABDEC1D832E4000CF422C /* access_utils.c in Sources */,
                                DC5ABDED1D832E4000CF422C /* translocate.c in Sources */,
                                DC5ABDEC1D832E4000CF422C /* access_utils.c in Sources */,
                                DC5ABDED1D832E4000CF422C /* translocate.c in Sources */,

-                               F9C8AFD222374D1100E7D6AE /* requirement.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30321,6 +35621,7 @@
                                DC5AC1031D83552000CF422C /* selfServer.cpp in Sources */,
                                DC5AC1041D83552000CF422C /* selfUser.cpp in Sources */,
                                DC5AC0D81D8354CA00CF422C /* main.cpp in Sources */,
                                DC5AC1031D83552000CF422C /* selfServer.cpp in Sources */,
                                DC5AC1041D83552000CF422C /* selfUser.cpp in Sources */,
                                DC5AC0D81D8354CA00CF422C /* main.cpp in Sources */,

+                               6C75560624212B4400025D78 /* keychainstasherinterface.m in Sources */,

                                DC5AC0D91D8354CA00CF422C /* connection.cpp in Sources */,
                                DC5AC0DA1D8354CA00CF422C /* database.cpp in Sources */,
                                DC5AC0DB1D8354CA00CF422C /* key.cpp in Sources */,
                                DC5AC0D91D8354CA00CF422C /* connection.cpp in Sources */,
                                DC5AC0DA1D8354CA00CF422C /* database.cpp in Sources */,
                                DC5AC0DB1D8354CA00CF422C /* key.cpp in Sources */,


@@ -30328,6 +35629,7 @@
                                DC5AC0DD1D8354CA00CF422C /* server.cpp in Sources */,
                                DC5AC0DE1D8354CA00CF422C /* session.cpp in Sources */,
                                DC5AC0DF1D8354CA00CF422C /* structure.cpp in Sources */,
                                DC5AC0DD1D8354CA00CF422C /* server.cpp in Sources */,
                                DC5AC0DE1D8354CA00CF422C /* session.cpp in Sources */,
                                DC5AC0DF1D8354CA00CF422C /* structure.cpp in Sources */,

+                               D4BD5E93228A720E001650A7 /* util.m in Sources */,

                                DC5AC0E01D8354CA00CF422C /* dbcrypto.cpp in Sources */,
                                DC5AC0E11D8354CA00CF422C /* localdatabase.cpp in Sources */,
                                DC5AC0E21D8354CA00CF422C /* localkey.cpp in Sources */,
                                DC5AC0E01D8354CA00CF422C /* dbcrypto.cpp in Sources */,
                                DC5AC0E11D8354CA00CF422C /* localdatabase.cpp in Sources */,
                                DC5AC0E21D8354CA00CF422C /* localkey.cpp in Sources */,


@@ -30337,7 +35639,6 @@
                                DC5AC0E61D8354CA00CF422C /* tokendatabase.cpp in Sources */,
                                DC5AC0E71D8354CA00CF422C /* tokenkey.cpp in Sources */,
                                DC5AC0E81D8354CA00CF422C /* tokenaccess.cpp in Sources */,
                                DC5AC0E61D8354CA00CF422C /* tokendatabase.cpp in Sources */,
                                DC5AC0E71D8354CA00CF422C /* tokenkey.cpp in Sources */,
                                DC5AC0E81D8354CA00CF422C /* tokenaccess.cpp in Sources */,

-                               DC5AC0E91D8354CA00CF422C /* pcscmonitor.cpp in Sources */,

                                DC5AC0EA1D8354CA00CF422C /* reader.cpp in Sources */,
                                DC5AC0EB1D8354CA00CF422C /* token.cpp in Sources */,
                                DC5AC0EC1D8354CA00CF422C /* tokend.cpp in Sources */,
                                DC5AC0EA1D8354CA00CF422C /* reader.cpp in Sources */,
                                DC5AC0EB1D8354CA00CF422C /* token.cpp in Sources */,
                                DC5AC0EC1D8354CA00CF422C /* tokend.cpp in Sources */,


@@ -30351,7 +35652,6 @@
                                DC5AC0F41D8354CA00CF422C /* credential.cpp in Sources */,
                                DC5AC0F51D8354CA00CF422C /* clientid.cpp in Sources */,
                                DC5AC0F61D8354CA00CF422C /* codesigdb.cpp in Sources */,
                                DC5AC0F41D8354CA00CF422C /* credential.cpp in Sources */,
                                DC5AC0F51D8354CA00CF422C /* clientid.cpp in Sources */,
                                DC5AC0F61D8354CA00CF422C /* codesigdb.cpp in Sources */,

-                               DC5AC0F71D8354CA00CF422C /* csproxy.cpp in Sources */,

                                DC5AC0F81D8354CA00CF422C /* agentquery.cpp in Sources */,
                                DC5AC0F91D8354CA00CF422C /* auditevents.cpp in Sources */,
                                DC5AC0FA1D8354CA00CF422C /* ccaudit_extensions.cpp in Sources */,
                                DC5AC0F81D8354CA00CF422C /* agentquery.cpp in Sources */,
                                DC5AC0F91D8354CA00CF422C /* auditevents.cpp in Sources */,
                                DC5AC0FA1D8354CA00CF422C /* ccaudit_extensions.cpp in Sources */,


@@ -30370,7 +35670,7 @@
                                DCCD33D31E3FF0D800AA4AD1 /* spi.c in Sources */,
                                DC610A181D78F129002223DE /* main.m in Sources */,
                                DC5F35B01EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,
                                DCCD33D31E3FF0D800AA4AD1 /* spi.c in Sources */,
                                DC610A181D78F129002223DE /* main.m in Sources */,
                                DC5F35B01EE0F27C00900966 /* server_entitlement_helpers.c in Sources */,

-                               DC4269121E82FDA1002B7110 /* server_security_helpers.c in Sources */,
+                               DC4269121E82FDA1002B7110 /* server_security_helpers.m in Sources */,

                                DCB2215A1E8B08CB001598BC /* server_xpc.m in Sources */,
                                DC4269011E82038D002B7110 /* server_endpoint.m in Sources */,
                        );
                                DCB2215A1E8B08CB001598BC /* server_xpc.m in Sources */,
                                DC4269011E82038D002B7110 /* server_endpoint.m in Sources */,
                        );


@@ -30421,38 +35721,13 @@
                                DC6A82BE1D87769800418608 /* transition.cpp in Sources */,
                                DC6A82BF1D8776B300418608 /* ucspClient.cpp in Sources */,
                                DC6A82C01D8776B300418608 /* ucspNotifySender.cpp in Sources */,
                                DC6A82BE1D87769800418608 /* transition.cpp in Sources */,
                                DC6A82BF1D8776B300418608 /* ucspClient.cpp in Sources */,
                                DC6A82C01D8776B300418608 /* ucspNotifySender.cpp in Sources */,

-                               DC6A82C11D8776B900418608 /* cshostingClient.cpp in Sources */,
-                               DC6A82C21D8776B900418608 /* cshostingServer.cpp in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DC71D9C31D95BA6C0065FB93 /* Sources */ = {
+               DC7FC44421EE914C003C39B8 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DC71D9C41D95BA6C0065FB93 /* X509Templates.c in Sources */,
-                               DC71D9C51D95BA6C0065FB93 /* keyTemplates.c in Sources */,
-                               DC71D9C61D95BA6C0065FB93 /* SecAsn1Templates.c in Sources */,
-                               DC71D9C71D95BA6C0065FB93 /* osKeyTemplates.c in Sources */,
-                               DC71D9C81D95BA6C0065FB93 /* nsprPortX.c in Sources */,
-                               DC71D9C91D95BA6C0065FB93 /* nameTemplates.c in Sources */,
-                               DC71D9CA1D95BA6C0065FB93 /* pkcs7Templates.c in Sources */,
-                               DC71D9CB1D95BA6C0065FB93 /* plarena.c in Sources */,
-                               DC71D9CC1D95BA6C0065FB93 /* secasn1e.c in Sources */,
-                               DC71D9CD1D95BA6C0065FB93 /* SecNssCoder.cpp in Sources */,
-                               DC71D9CE1D95BA6C0065FB93 /* oidsalg.c in Sources */,
-                               DC71D9CF1D95BA6C0065FB93 /* ocspTemplates.c in Sources */,
-                               DC71D9D01D95BA6C0065FB93 /* certExtensionTemplates.c in Sources */,
-                               DC71D9D11D95BA6C0065FB93 /* secport.c in Sources */,
-                               DC71D9D21D95BA6C0065FB93 /* nssUtils.c in Sources */,
-                               DC71D9D31D95BA6C0065FB93 /* pkcs12Templates.c in Sources */,
-                               DC71D9D41D95BA6C0065FB93 /* csrTemplates.c in Sources */,
-                               DC71D9D51D95BA6C0065FB93 /* oidsattr.c in Sources */,
-                               DC71D9D61D95BA6C0065FB93 /* secErrorStr.c in Sources */,
-                               DC71D9D71D95BA6C0065FB93 /* oidsocsp.c in Sources */,
-                               DC71D9D81D95BA6C0065FB93 /* secasn1d.c in Sources */,
-                               DC71D9D91D95BA6C0065FB93 /* SecAsn1Coder.c in Sources */,
-                               DC71D9DA1D95BA6C0065FB93 /* secasn1u.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30486,6 +35761,103 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DC99B86A20EACA470065B73B /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCE405C523A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift in Sources */,
+                               1B8D2D96226E1FA500C94238 /* SetValueTransformer.swift in Sources */,
+                               0CCC21FC23F33DA900E1FCD0 /* OTICDPRecordContext.m in Sources */,
+                               DC5F2BBE2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift in Sources */,
+                               DCB468E520EC262C00BA7E5B /* ContainerMap.swift in Sources */,
+                               0CA1D0B923E9034600021038 /* OctagonTests+EscrowTestVectors.swift in Sources */,
+                               0C4CDE6F22922E550050C499 /* OctagonTests+RecoveryKey.swift in Sources */,
+                               EBDE5E0F22BA3DEA00A229C8 /* CKKSMockOctagonAdapter.m in Sources */,
+                               DCB468DF20EC25FF00BA7E5B /* Client.swift in Sources */,
+                               0C5824A52286002D009E8C15 /* OctagonTests+HealthCheck.swift in Sources */,
+                               0C468FFD23C7D4F9006F4582 /* OTEscrowRecord.m in Sources */,
+                               DC27C3CE20EAFE9C00F7839C /* CloudKitMockXCTest.m in Sources */,
+                               DCB9475821274F9D00ED9272 /* TPHObjcTranslation.m in Sources */,
+                               DC27C3CB20EADF3500F7839C /* CloudKitKeychainSyncingMockXCTest.m in Sources */,
+                               0C87D3E4229368BD007853B5 /* OctagonTests+SOS.swift in Sources */,
+                               DC27C3C920EADEE700F7839C /* MockCloudKit.m in Sources */,
+                               0CCC21FD23F33DCE00E1FCD0 /* OTCDPRecoveryInformation.m in Sources */,
+                               0CF70BE0218CF26600EC3515 /* BottledPeer.swift in Sources */,
+                               DC99B86B20EACA470065B73B /* spi.c in Sources */,
+                               DC4CD9842372294E00EF55FC /* OctagonTests+Helpers.swift in Sources */,
+                               0C3C47C924902DA50084B951 /* OTSupportOctagonMessage.m in Sources */,
+                               DCAA209A23AAF8F600DCB594 /* Container_RecoveryKey.swift in Sources */,
+                               DCA7F7EF23A44AA200927989 /* OctagonPolicyTests.swift in Sources */,
+                               DCDF03122284E34B008055BA /* OctagonTests+EscrowRecovery.swift in Sources */,
+                               DCFF82712162834D00D54B02 /* OctagonTestsXPCConnections.swift in Sources */,
+                               DC5BEACD2217509A001681F0 /* OctagonTests+CloudKitAccount.swift in Sources */,
+                               0CF70BDB218BEFF000EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */,
+                               DC07090422936DB2002711B9 /* OctagonTests+ErrorHandling.swift in Sources */,
+                               DC99B86C20EACA470065B73B /* FakeCuttlefish.swift in Sources */,
+                               0CBEF3432242CA0600015691 /* TestsObjcTranslation.m in Sources */,
+                               0C468FFE23C7D4F9006F4582 /* OTEscrowRecordMetadata.m in Sources */,
+                               5A04BB0222982733001848A0 /* OTFollowupTests.m in Sources */,
+                               DCB24B45221B901700BE73FE /* CKKSMockSOSPresentAdapter.m in Sources */,
+                               DC33D7BE2374FD0A00A68155 /* OTSponsorToApplicantRound2M2.m in Sources */,
+                               0CE15E31222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */,
+                               0C3C47C824902DA50084B951 /* OTSupportSOSMessage.m in Sources */,
+                               0C468FFF23C7D4F9006F4582 /* OTEscrowRecordMetadataClientMetadata.m in Sources */,
+                               0CADDF0721545CF100DF8B06 /* OctagonPairingTests.swift in Sources */,
+                               DC99B86D20EACA470065B73B /* SecdWatchdog.m in Sources */,
+                               DC26666C21CAC97000F19960 /* OTControlCLI.m in Sources */,
+                               DC99B86E20EACA470065B73B /* MockCuttlefish.swift in Sources */,
+                               0CF70BE3218CF2AA00EC3515 /* OTBottle.m in Sources */,
+                               DC27C3CA20EADF1700F7839C /* CloudKitKeychainSyncingTestsBase.m in Sources */,
+                               0C3DF8CA24789D0A009CF03A /* Container_Peers.swift in Sources */,
+                               0CF70BE4218CF2AA00EC3515 /* OTBottleContents.m in Sources */,
+                               0C61F1F92194FC82009566D4 /* OTAuthenticatedCiphertext+SF.m in Sources */,
+                               DCB0C291222F5E130083AECB /* CuttlefishErrors.swift in Sources */,
+                               DC99B86F20EACA470065B73B /* SecFramework.c in Sources */,
+                               0CBF883D23AAD9F100652EDD /* OctagonTests+EscrowRecords.swift in Sources */,
+                               0C5258BB21BB128000B32C96 /* FakeSOSControl.m in Sources */,
+                               DC3A9B2723A9D8BD0073ED06 /* Container_BottledPeers.swift in Sources */,
+                               DC99B87020EACA470065B73B /* server_endpoint.m in Sources */,
+                               0CD5797A21498F8200C43496 /* OctagonPairingTests+Piggybacking.swift in Sources */,
+                               DC4A73C5235E69D800DB1E6E /* OTApplicantToSponsorRound2M1.m in Sources */,
+                               DCAD8F8722C43ECA007C3872 /* Container_MachineIDs.swift in Sources */,
+                               DC03592D235FCCD500F14883 /* KCInitialMessageData.m in Sources */,
+                               DC99B87120EACA470065B73B /* server_security_helpers.m in Sources */,
+                               0CF70BE1218CF27600EC3515 /* EscrowKeys.swift in Sources */,
+                               DC7F79B622EA4ED4001FB69A /* OctagonTests+CKKS.swift in Sources */,
+                               0CBA047D214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift in Sources */,
+                               DCF6320821C09DCE0030CCC0 /* CuttlefishAPIHelpers.swift in Sources */,
+                               0CE15E44222DF6A800B7EAA4 /* Recovery.m in Sources */,
+                               DC4415B423610BF40087981C /* OctagonTests+Account.swift in Sources */,
+                               DC725030229600C000493D88 /* OctagonTests+Reset.swift in Sources */,
+                               0C3E316B21372FA50093C04B /* OctagonPairingTests+ProximitySetup.swift in Sources */,
+                               DC2819B922F8F6FE007829F5 /* OctagonTests+DeviceList.swift in Sources */,
+                               0CF70BE5218CF2AA00EC3515 /* OTPrivateKey.m in Sources */,
+                               BECFA45920FEB90900B11002 /* Policy.swift in Sources */,
+                               DC99B87220EACA470065B73B /* Cuttlefish.pb.swift in Sources */,
+                               0CF70BE2218CF2AA00EC3515 /* OTAuthenticatedCiphertext.m in Sources */,
+                               DCB41E01216D5FE500F219E0 /* OctagonDataPersistenceTests.swift in Sources */,
+                               DC85687E2284E7860088D3EF /* OctagonTestMocks.swift in Sources */,
+                               DC0DE87123750340006E2EAE /* OTPairingMessage.m in Sources */,
+                               DC99B87320EACA470065B73B /* Decrypter.swift in Sources */,
+                               DC99B87420EACA470065B73B /* server_entitlement_helpers.c in Sources */,
+                               DC99B87520EACA470065B73B /* TrustedPeersHelper.xcdatamodeld in Sources */,
+                               DC9978B92404AA3200A5EE2F /* Container_UserSync.swift in Sources */,
+                               0CE15E2D222DF63600B7EAA4 /* RecoveryKey.swift in Sources */,
+                               DC27C3C120EAD9C300F7839C /* OctagonTests.swift in Sources */,
+                               0CE15E3F222DF6A800B7EAA4 /* OTRecovery.m in Sources */,
+                               0C0CB73A23AD715A0020C6BF /* Container_EscrowRecords.swift in Sources */,
+                               DCB9475A2127534C00ED9272 /* OctagonTests+SOSUpgrade.swift in Sources */,
+                               DC7F6A7D233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift in Sources */,
+                               DC99B87720EACA470065B73B /* ContainerSync.swift in Sources */,
+                               DC33D7BD2374FD0500A68155 /* OTSponsorToApplicantRound1M2.m in Sources */,
+                               0CCC21FE23F33DD400E1FCD0 /* OTEscrowAuthenticationInformation.m in Sources */,
+                               0C61F1F62194FC79009566D4 /* OTPrivateKey+SF.m in Sources */,
+                               DC391FA821C04DAE00772585 /* OctagonPeerKeys.swift in Sources */,
+                               DC99B87820EACA470065B73B /* Container.swift in Sources */,
+                               DC99B87920EACA470065B73B /* Utils.swift in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCB340681D8A24DF0054D16E /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                DCB340681D8A24DF0054D16E /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -30568,7 +35940,6 @@
                                DCB3420E1D8A2BAD0054D16E /* cssmdbname.cpp in Sources */,
                                DCB341F01D8A2BAC0054D16E /* acl_protectedpw.cpp in Sources */,
                                DCB342211D8A2BAD0054D16E /* handleobject.cpp in Sources */,
                                DCB3420E1D8A2BAD0054D16E /* cssmdbname.cpp in Sources */,
                                DCB341F01D8A2BAC0054D16E /* acl_protectedpw.cpp in Sources */,
                                DCB342211D8A2BAD0054D16E /* handleobject.cpp in Sources */,

-                               DCB3422C1D8A2BAD0054D16E /* uniformrandom.cpp in Sources */,

                                DCB341EE1D8A2BAC0054D16E /* acl_prompted.cpp in Sources */,
                                DCB341E41D8A2BAC0054D16E /* acl_codesigning.cpp in Sources */,
                                DCB342121D8A2BAD0054D16E /* cssmerrors.cpp in Sources */,
                                DCB341EE1D8A2BAC0054D16E /* acl_prompted.cpp in Sources */,
                                DCB341E41D8A2BAC0054D16E /* acl_codesigning.cpp in Sources */,
                                DCB342121D8A2BAD0054D16E /* cssmerrors.cpp in Sources */,


@@ -30599,6 +35970,7 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               6C2D463D24C88AA10015C3C9 /* LegacyAPICounts.m in Sources */,

                                DCB3433D1D8A32A20054D16E /* ACL.cpp in Sources */,
                                DCB3433B1D8A32A20054D16E /* Access.cpp in Sources */,
                                DCB3436A1D8A32A20054D16E /* CCallbackMgr.cp in Sources */,
                                DCB3433D1D8A32A20054D16E /* ACL.cpp in Sources */,
                                DCB3433B1D8A32A20054D16E /* Access.cpp in Sources */,
                                DCB3436A1D8A32A20054D16E /* CCallbackMgr.cp in Sources */,


@@ -30625,7 +35997,6 @@
                                DCB342FB1D8A32A20054D16E /* SecBase.cpp in Sources */,
                                DCB3435B1D8A32A20054D16E /* SecCFTypes.cpp in Sources */,
                                DCB342FD1D8A32A20054D16E /* SecCertificate.cpp in Sources */,
                                DCB342FB1D8A32A20054D16E /* SecBase.cpp in Sources */,
                                DCB3435B1D8A32A20054D16E /* SecCFTypes.cpp in Sources */,
                                DCB342FD1D8A32A20054D16E /* SecCertificate.cpp in Sources */,

-                               DCB342FE1D8A32A20054D16E /* SecCertificateBundle.cpp in Sources */,

                                DCB343921D8A32A20054D16E /* SecExport.cpp in Sources */,
                                DCB343931D8A32A20054D16E /* SecExternalRep.cpp in Sources */,
                                DCB343371D8A32A20054D16E /* SecFDERecoveryAsymmetricCrypto.cpp in Sources */,
                                DCB343921D8A32A20054D16E /* SecExport.cpp in Sources */,
                                DCB343931D8A32A20054D16E /* SecExternalRep.cpp in Sources */,
                                DCB343371D8A32A20054D16E /* SecFDERecoveryAsymmetricCrypto.cpp in Sources */,


@@ -30643,7 +36014,6 @@
                                DCB343021D8A32A20054D16E /* SecItemConstants.c in Sources */,
                                DCB343041D8A32A20054D16E /* SecKey.cpp in Sources */,
                                DCB343051D8A32A20054D16E /* SecKeychain.cpp in Sources */,
                                DCB343021D8A32A20054D16E /* SecItemConstants.c in Sources */,
                                DCB343041D8A32A20054D16E /* SecKey.cpp in Sources */,
                                DCB343051D8A32A20054D16E /* SecKeychain.cpp in Sources */,

-                               DCB3435D1D8A32A20054D16E /* SecKeychainAddIToolsPassword.cpp in Sources */,

                                DCB343061D8A32A20054D16E /* SecKeychainItem.cpp in Sources */,
                                DCB343071D8A32A20054D16E /* SecKeychainItemExtendedAttributes.cpp in Sources */,
                                DCB343081D8A32A20054D16E /* SecKeychainSearch.cpp in Sources */,
                                DCB343061D8A32A20054D16E /* SecKeychainItem.cpp in Sources */,
                                DCB343071D8A32A20054D16E /* SecKeychainItemExtendedAttributes.cpp in Sources */,
                                DCB343081D8A32A20054D16E /* SecKeychainSearch.cpp in Sources */,


@@ -30728,6 +36098,25 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

+               DCBF4A9921FFC82100539F0A /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCBF4AE521FFC9B300539F0A /* SecEscrowRequestTests.m in Sources */,
+                               DCBF4A9A21FFC82100539F0A /* SecdWatchdog.m in Sources */,
+                               DCBF4AAE21FFC82100539F0A /* SecTask.c in Sources */,
+                               DCBF4AB521FFC82100539F0A /* server_xpc.m in Sources */,
+                               DCBF4AB621FFC82100539F0A /* server_security_helpers.m in Sources */,
+                               DCBF4AB721FFC82100539F0A /* server_endpoint.m in Sources */,
+                               DCBF4ABA21FFC82100539F0A /* spi.c in Sources */,
+                               DCA9D84821FFEE9800B27421 /* EscrowRequestXPCProtocol.m in Sources */,
+                               DCAB17CE21FFF75B00E1DFCF /* MockSynchronousEscrowServer.m in Sources */,
+                               DCBF4ABB21FFC82100539F0A /* SecFramework.c in Sources */,
+                               DCBF4ABE21FFC82100539F0A /* server_entitlement_helpers.c in Sources */,
+                               A6C737C123F37AC00009C930 /* entitlements.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };

                DCC78EA51D8088E200865A7C /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                DCC78EA51D8088E200865A7C /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;


@@ -30740,10 +36129,10 @@
                                DCC78EE41D808B1B00865A7C /* SecCFAllocator.c in Sources */,
                                DCC78EE31D808B1300865A7C /* SecCMS.c in Sources */,
                                BEEB47D91EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,
                                DCC78EE41D808B1B00865A7C /* SecCFAllocator.c in Sources */,
                                DCC78EE31D808B1300865A7C /* SecCMS.c in Sources */,
                                BEEB47D91EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,

+                               6C220088244F075E000A4557 /* SecItemRateLimit.m in Sources */,

                                DCC78EE21D808B0E00865A7C /* SecCTKKey.m in Sources */,
                                DCC78EE11D808B0900865A7C /* SecCertificate.c in Sources */,
                                DC4269041E82EDAC002B7110 /* SecItem.m in Sources */,
                                DCC78EE21D808B0E00865A7C /* SecCTKKey.m in Sources */,
                                DCC78EE11D808B0900865A7C /* SecCertificate.c in Sources */,
                                DC4269041E82EDAC002B7110 /* SecItem.m in Sources */,

-                               EBEEEE3D1EA31DB000E15F5C /* SOSControlHelper.m in Sources */,

                                DCC78EDF1D808AF800865A7C /* SecCertificateRequest.c in Sources */,
                                DCC78EDE1D808AF100865A7C /* SecDH.c in Sources */,
                                DCC78EDD1D808AEC00865A7C /* SecDigest.c in Sources */,
                                DCC78EDF1D808AF800865A7C /* SecCertificateRequest.c in Sources */,
                                DCC78EDE1D808AF100865A7C /* SecDH.c in Sources */,
                                DCC78EDD1D808AEC00865A7C /* SecDigest.c in Sources */,


@@ -30754,16 +36143,16 @@
                                DCC78ED71D808AC000865A7C /* SecItem.c in Sources */,
                                DCC78ED61D808ABA00865A7C /* SecItemBackup.c in Sources */,
                                DCC78ED51D808AAE00865A7C /* SecItemConstants.c in Sources */,
                                DCC78ED71D808AC000865A7C /* SecItem.c in Sources */,
                                DCC78ED61D808ABA00865A7C /* SecItemBackup.c in Sources */,
                                DCC78ED51D808AAE00865A7C /* SecItemConstants.c in Sources */,

-                               DCC78ED41D808AA800865A7C /* SecKey.c in Sources */,
+                               DCC78ED41D808AA800865A7C /* SecKey.m in Sources */,

                                DCC78ED31D808AA000865A7C /* SecKeyAdaptors.m in Sources */,
                                DCC78ED21D808A9500865A7C /* SecOTRDHKey.c in Sources */,
                                DCC78ED11D808A8E00865A7C /* SecOTRFullIdentity.c in Sources */,
                                B61577ED1F202049004A3930 /* SecPaddingConfigurations.c in Sources */,
                                DCC78ED01D808A8800865A7C /* SecOTRMath.c in Sources */,
                                DCC78ED31D808AA000865A7C /* SecKeyAdaptors.m in Sources */,
                                DCC78ED21D808A9500865A7C /* SecOTRDHKey.c in Sources */,
                                DCC78ED11D808A8E00865A7C /* SecOTRFullIdentity.c in Sources */,
                                B61577ED1F202049004A3930 /* SecPaddingConfigurations.c in Sources */,
                                DCC78ED01D808A8800865A7C /* SecOTRMath.c in Sources */,

-                               0927FEBC1F81338600864E07 /* SecKeyProxy.m in Sources */,

                                DCC78ECF1D808A8200865A7C /* SecOTRPacketData.c in Sources */,
                                DCC78ECE1D808A7B00865A7C /* SecOTRPackets.c in Sources */,
                                DCC78ECD1D808A7300865A7C /* SecOTRPublicIdentity.c in Sources */,
                                DCC78ECF1D808A8200865A7C /* SecOTRPacketData.c in Sources */,
                                DCC78ECE1D808A7B00865A7C /* SecOTRPackets.c in Sources */,
                                DCC78ECD1D808A7300865A7C /* SecOTRPublicIdentity.c in Sources */,

+                               4780146A1FBF5BD600C4043D /* SecKeyProxy.m in Sources */,

                                DCC78ECC1D808A6B00865A7C /* SecOTRSession.c in Sources */,
                                DCC78ECB1D808A6600865A7C /* SecOTRSessionAKE.c in Sources */,
                                DCC78ECA1D808A6000865A7C /* SecOTRUtils.c in Sources */,
                                DCC78ECC1D808A6B00865A7C /* SecOTRSession.c in Sources */,
                                DCC78ECB1D808A6600865A7C /* SecOTRSessionAKE.c in Sources */,
                                DCC78ECA1D808A6000865A7C /* SecOTRUtils.c in Sources */,


@@ -30779,7 +36168,7 @@
                                DCC78EC01D808A1C00865A7C /* SecTrust.c in Sources */,
                                DCC78EBE1D808A0E00865A7C /* SecTrustStore.c in Sources */,
                                DCC78EBD1D808A0400865A7C /* SecuritydXPC.c in Sources */,
                                DCC78EC01D808A1C00865A7C /* SecTrust.c in Sources */,
                                DCC78EBE1D808A0E00865A7C /* SecTrustStore.c in Sources */,
                                DCC78EBD1D808A0400865A7C /* SecuritydXPC.c in Sources */,

-                               DCC78EBC1D8089CD00865A7C /* verify_cert.c in Sources */,
+                               5A442FAB233C351300918373 /* SecExperiment.m in Sources */,

                                DCC78EBB1D8089C200865A7C /* p12import.c in Sources */,
                                D425EC1D1DD3C3CF00DE5DEC /* SecInternalRelease.c in Sources */,
                                DCC78EBA1D8089BD00865A7C /* p12pbegen.c in Sources */,
                                DCC78EBB1D8089C200865A7C /* p12import.c in Sources */,
                                D425EC1D1DD3C3CF00DE5DEC /* SecInternalRelease.c in Sources */,
                                DCC78EBA1D8089BD00865A7C /* p12pbegen.c in Sources */,


@@ -30823,6 +36212,8 @@
                                DCD068221D8CDF7E007602F1 /* SecCodeSigner.cpp in Sources */,
                                DCD068201D8CDF7E007602F1 /* SecRequirement.cpp in Sources */,
                                DCD0681D1D8CDF7E007602F1 /* SecStaticCode.cpp in Sources */,
                                DCD068221D8CDF7E007602F1 /* SecCodeSigner.cpp in Sources */,
                                DCD068201D8CDF7E007602F1 /* SecRequirement.cpp in Sources */,
                                DCD0681D1D8CDF7E007602F1 /* SecStaticCode.cpp in Sources */,

+                               1F631C5622387FFE005920D8 /* legacydevid.cpp in Sources */,
+                               A6C737BA23F37A4B0009C930 /* entitlements.c in Sources */,

                                DCD0682C1D8CDF7E007602F1 /* StaticCode.cpp in Sources */,
                                DCD0693D1D8CDFFF007602F1 /* String.cpp in Sources */,
                                DCD0693E1D8CDFFF007602F1 /* Token.cpp in Sources */,
                                DCD0682C1D8CDF7E007602F1 /* StaticCode.cpp in Sources */,
                                DCD0693D1D8CDFFF007602F1 /* String.cpp in Sources */,
                                DCD0693E1D8CDFFF007602F1 /* Token.cpp in Sources */,


@@ -30841,7 +36232,6 @@
                                DCD068281D8CDF7E007602F1 /* cs.cpp in Sources */,
                                DCD0686F1D8CDF7E007602F1 /* csdatabase.cpp in Sources */,
                                DCD068711D8CDF7E007602F1 /* cserror.cpp in Sources */,
                                DCD068281D8CDF7E007602F1 /* cs.cpp in Sources */,
                                DCD0686F1D8CDF7E007602F1 /* csdatabase.cpp in Sources */,
                                DCD068711D8CDF7E007602F1 /* cserror.cpp in Sources */,

-                               DCD068521D8CDF7E007602F1 /* csgeneric.cpp in Sources */,

                                DCD0684E1D8CDF7E007602F1 /* cskernel.cpp in Sources */,
                                DCD068501D8CDF7E007602F1 /* csprocess.cpp in Sources */,
                                DCD068771D8CDF7E007602F1 /* csutilities.cpp in Sources */,
                                DCD0684E1D8CDF7E007602F1 /* cskernel.cpp in Sources */,
                                DCD068501D8CDF7E007602F1 /* csprocess.cpp in Sources */,
                                DCD068771D8CDF7E007602F1 /* csutilities.cpp in Sources */,


@@ -30888,7 +36278,6 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCD06A531D8CE2A4007602F1 /* SecCodeHostLib.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


@@ -30904,9 +36293,9 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

+                               DA2C402E2189302F005F1CC3 /* mach_notify.defs in Sources */,

                                DCD06B9C1D8E0D7D007602F1 /* cfmach++.cpp in Sources */,
                                DCD06B5D1D8E0D7D007602F1 /* hashing.cpp in Sources */,
                                DCD06B9C1D8E0D7D007602F1 /* cfmach++.cpp in Sources */,
                                DCD06B5D1D8E0D7D007602F1 /* hashing.cpp in Sources */,

-                               DCD06B531D8E0D7D007602F1 /* devrandom.cpp in Sources */,

                                DCD06B8E1D8E0D7D007602F1 /* pcsc++.cpp in Sources */,
                                DCD06B4B1D8E0D7D007602F1 /* ccaudit.cpp in Sources */,
                                DCD06BAB1D8E0D7D007602F1 /* cfmunge.cpp in Sources */,
                                DCD06B8E1D8E0D7D007602F1 /* pcsc++.cpp in Sources */,
                                DCD06B4B1D8E0D7D007602F1 /* ccaudit.cpp in Sources */,
                                DCD06BAB1D8E0D7D007602F1 /* cfmunge.cpp in Sources */,


@@ -30922,7 +36311,6 @@
                                DCD06B831D8E0D7D007602F1 /* utilities.cpp in Sources */,
                                DCD06BA31D8E0D7D007602F1 /* machserver.cpp in Sources */,
                                DCD06BAD1D8E0D7D007602F1 /* cfutilities.cpp in Sources */,
                                DCD06B831D8E0D7D007602F1 /* utilities.cpp in Sources */,
                                DCD06BA31D8E0D7D007602F1 /* machserver.cpp in Sources */,
                                DCD06BAD1D8E0D7D007602F1 /* cfutilities.cpp in Sources */,

-                               DCD06B9A1D8E0D7D007602F1 /* mach_notify.c in Sources */,

                                DCD06B431D8E0D7D007602F1 /* crc.c in Sources */,
                                DCD06B701D8E0D7D007602F1 /* sqlite++.cpp in Sources */,
                                DCD06B541D8E0D7D007602F1 /* dispatch.cpp in Sources */,
                                DCD06B431D8E0D7D007602F1 /* crc.c in Sources */,
                                DCD06B701D8E0D7D007602F1 /* sqlite++.cpp in Sources */,
                                DCD06B541D8E0D7D007602F1 /* dispatch.cpp in Sources */,


@@ -30934,11 +36322,9 @@
                                DCD06B921D8E0D7D007602F1 /* unix++.cpp in Sources */,
                                DCD06BA71D8E0D7D007602F1 /* coderepository.cpp in Sources */,
                                DCD06B481D8E0D7D007602F1 /* alloc.cpp in Sources */,
                                DCD06B921D8E0D7D007602F1 /* unix++.cpp in Sources */,
                                DCD06BA71D8E0D7D007602F1 /* coderepository.cpp in Sources */,
                                DCD06B481D8E0D7D007602F1 /* alloc.cpp in Sources */,

-                               DCD06B961D8E0D7D007602F1 /* vproc++.cpp in Sources */,

                                DCD06B8C1D8E0D7D007602F1 /* muscle++.cpp in Sources */,
                                DCD06B461D8E0D7D007602F1 /* adornments.cpp in Sources */,
                                DCD06B511D8E0D7D007602F1 /* debugging_internal.cpp in Sources */,
                                DCD06B8C1D8E0D7D007602F1 /* muscle++.cpp in Sources */,
                                DCD06B461D8E0D7D007602F1 /* adornments.cpp in Sources */,
                                DCD06B511D8E0D7D007602F1 /* debugging_internal.cpp in Sources */,

-                               DCD06B721D8E0D7D007602F1 /* streams.cpp in Sources */,

                                DCD06BA91D8E0D7D007602F1 /* cfclass.cpp in Sources */,
                                DCD06B981D8E0D7D007602F1 /* mach++.cpp in Sources */,
                                DCD06B941D8E0D7D007602F1 /* unixchild.cpp in Sources */,
                                DCD06BA91D8E0D7D007602F1 /* cfclass.cpp in Sources */,
                                DCD06B981D8E0D7D007602F1 /* mach++.cpp in Sources */,
                                DCD06B941D8E0D7D007602F1 /* unixchild.cpp in Sources */,


@@ -30948,7 +36334,6 @@
                                DCD06B5B1D8E0D7D007602F1 /* globalizer.cpp in Sources */,
                                DCD06B681D8E0D7D007602F1 /* powerwatch.cpp in Sources */,
                                DCD06B4E1D8E0D7D007602F1 /* daemon.cpp in Sources */,
                                DCD06B5B1D8E0D7D007602F1 /* globalizer.cpp in Sources */,
                                DCD06B681D8E0D7D007602F1 /* powerwatch.cpp in Sources */,
                                DCD06B4E1D8E0D7D007602F1 /* daemon.cpp in Sources */,

-                               DCD06BA51D8E0D7D007602F1 /* machrunloopserver.cpp in Sources */,

                                DCD06B8A1D8E0D7D007602F1 /* kq++.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                DCD06B8A1D8E0D7D007602F1 /* kq++.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;


@@ -30962,7 +36347,7 @@
                                DCD66DBF1D82053E00DB1393 /* SecDigest.c in Sources */,
                                BEEB47DA1EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,
                                DCD66DBE1D82053700DB1393 /* SecBase64.c in Sources */,
                                DCD66DBF1D82053E00DB1393 /* SecDigest.c in Sources */,
                                BEEB47DA1EA189F5004AA5C6 /* SecTrustStatusCodes.c in Sources */,
                                DCD66DBE1D82053700DB1393 /* SecBase64.c in Sources */,

-                               DCD66DB61D82050900DB1393 /* SecKey.c in Sources */,
+                               DCD66DB61D82050900DB1393 /* SecKey.m in Sources */,

                                DCD66DBC1D82052B00DB1393 /* SecKeyAdaptors.m in Sources */,
                                DCD66DBB1D82052700DB1393 /* SecPolicy.c in Sources */,
                                DCD66DBA1D82052000DB1393 /* SecPolicyLeafCallbacks.c in Sources */,
                                DCD66DBC1D82052B00DB1393 /* SecKeyAdaptors.m in Sources */,
                                DCD66DBB1D82052700DB1393 /* SecPolicy.c in Sources */,
                                DCD66DBA1D82052000DB1393 /* SecPolicyLeafCallbacks.c in Sources */,


@@ -30992,1281 +36377,2169 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCD8A1071E09EE0F00E4FA0A /* Sources */ = {
+               DCD8A1071E09EE0F00E4FA0A /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCD8A19D1E09EEC800E4FA0A /* SOSBackupSliceKeyBag.m in Sources */,
+                               DC2670FB1F3E72C000816EED /* SOSCircleDer.c in Sources */,
+                               DCD8A1B31E09F12D00E4FA0A /* SOSCircle.c in Sources */,
+                               DCD8A1FF1E09FA6100E4FA0A /* secViewDisplay.c in Sources */,
+                               DC2FA72520E57AB500DB7518 /* SOSPeerInfo.m in Sources */,
+                               DCD8A1B41E09F12D00E4FA0A /* SOSCircleV2.c in Sources */,
+                               DCD8A1A01E09EF3500E4FA0A /* SOSCloudKeychainClient.c in Sources */,
+                               DC752F1721C1B48400216089 /* SOSPiggyback.m in Sources */,
+                               DCD8A1A11E09EF5C00E4FA0A /* SOSCloudKeychainConstants.c in Sources */,
+                               DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */,
+                               DCD8A1BD1E09F1D600E4FA0A /* SOSFullPeerInfo.m in Sources */,
+                               DCD8A1B51E09F15400E4FA0A /* SOSGenCount.c in Sources */,
+                               DCD8A19F1E09EF0F00E4FA0A /* SOSInternal.m in Sources */,
+                               EBEEEE3F1EA31E6D00E15F5C /* SOSControlHelper.m in Sources */,
+                               DCD8A1A61E09EFD700E4FA0A /* SOSKVSKeys.m in Sources */,
+                               DCD8A1B61E09F16C00E4FA0A /* SOSKeyedPubKeyIdentifier.c in Sources */,
+                               DCD8A1A41E09EF9000E4FA0A /* SOSPeerInfoCollections.c in Sources */,
+                               DCD8A1B11E09F11900E4FA0A /* SOSPeerInfoDER.m in Sources */,
+                               DCD8A1B21E09F11900E4FA0A /* SOSPeerInfoRingState.m in Sources */,
+                               DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */,
+                               DCD8A1BC1E09F1BB00E4FA0A /* SOSRingPeerInfoUtils.c in Sources */,
+                               DCD8A1B71E09F19100E4FA0A /* SOSRingV0.m in Sources */,
+                               DCD8A1511E09EE0F00E4FA0A /* SOSViews.m in Sources */,
+                               DCD8A19E1E09EEDA00E4FA0A /* SecRecoveryKey.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E6911D7A37FA00AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DC8506A62097EE7300C712EC /* SecurityTool.c in Sources */,
+                               DC3AA28D2097E24B007CA68A /* scep.c in Sources */,
+                               DC3AA2912097E25B007CA68A /* trust_update.m in Sources */,
+                               DC85069B2097E69500C712EC /* keychain_backup.c in Sources */,
+                               1BDEBEF92252DEB1009AD3D6 /* policy_dryrun.m in Sources */,
+                               DC8506B52097F1FD00C712EC /* whoami.m in Sources */,
+                               DC8506AB2097EEA600C712EC /* syncbubble.m in Sources */,
+                               DC8506A92097EE8F00C712EC /* KeychainCheck.m in Sources */,
+                               DC3AA2832097E21C007CA68A /* log_control.c in Sources */,
+                               DC3AA27A2097DF84007CA68A /* not_on_this_platorm.c in Sources */,
+                               DC3AA2802097E20B007CA68A /* keychain_util.c in Sources */,
+                               DCE4E6921D7A37FA00AFB96E /* security_tool_commands.c in Sources */,
+                               DC3AA2852097E22A007CA68A /* codesign.c in Sources */,
+                               DC8506AD2097EEBC00C712EC /* sos.m in Sources */,
+                               DCE4E6931D7A37FA00AFB96E /* NSFileHandle+Formatting.m in Sources */,
+                               BE57B11A2509E1000045B7FD /* ca_revocation_additions.m in Sources */,
+                               DC3AA2892097E23A007CA68A /* keychain_find.m in Sources */,
+                               DC3AA2792097DF71007CA68A /* readline.c in Sources */,
+                               DC3AA2822097E218007CA68A /* add_internet_password.c in Sources */,
+                               DC8506B32097F1E000C712EC /* digest_calc.c in Sources */,
+                               DC8506AF2097EEDB00C712EC /* leaks.c in Sources */,
+                               DC3AA2902097E254007CA68A /* show_certificates.c in Sources */,
+                               DC3AA2932097E263007CA68A /* spc.c in Sources */,
+                               DC3AA27E2097E207007CA68A /* verify_cert.c in Sources */,
+                               D4A3A598217A85D600F0A8DA /* ct_exceptions.m in Sources */,
+                               DC3AA2882097E232007CA68A /* keychain_add.c in Sources */,
+                               DC3AA28C2097E23F007CA68A /* pkcs12_util.c in Sources */,
+                               DC8506B12097EEF300C712EC /* print_cert.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E74C1D7A43B500AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7C81D7A4AED00AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E7F21D7A4DA800AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               1B995259226681FA00A2D6CD /* PolicyReporter.h in Sources */,
+                               1B99525A226681FA00A2D6CD /* PolicyReporter.m in Sources */,
+                               DCCD33CE1E3FEF1700AA4AD1 /* spi.c in Sources */,
+                               476541701F33B59300413F65 /* SecdWatchdog.m in Sources */,
+                               DCE4E8071D7A4DE200AFB96E /* server.c in Sources */,
+                               D4BD5E85228A6854001650A7 /* util.m in Sources */,
+                               DC5F35A61EE0F25000900966 /* server_entitlement_helpers.c in Sources */,
+                               DC4269081E82FD8B002B7110 /* server_security_helpers.m in Sources */,
+                               DCB221501E8B08A5001598BC /* server_xpc.m in Sources */,
+                               DC6ACC461E81E08D00125DC5 /* server_endpoint.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E8381D7A57AE00AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D4BEECE81E93094500F76D1A /* trustd.c in Sources */,
+                               DC5F35A91EE0F25300900966 /* server_entitlement_helpers.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E8901D7F34F600AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCE4E8C21D7F353900AFB96E /* server.c in Sources */,
+                               DCE4E8BA1D7F353900AFB96E /* credential.c in Sources */,
+                               DCE4E8BF1D7F353900AFB96E /* object.c in Sources */,
+                               DCE4E8B51D7F353900AFB96E /* authitems.c in Sources */,
+                               DCE4E8B91D7F353900AFB96E /* crc.c in Sources */,
+                               DCE4E8C31D7F353900AFB96E /* session.c in Sources */,
+                               DCE4E8BC1D7F353900AFB96E /* engine.c in Sources */,
+                               DCE4E8C41D7F353900AFB96E /* connection.c in Sources */,
+                               F681C3AB2386B8C30083F22C /* PreloginUserDb.m in Sources */,
+                               DCE4E8C11D7F353900AFB96E /* rule.c in Sources */,
+                               DCE4E8C01D7F353900AFB96E /* process.c in Sources */,
+                               DCE4E8B31D7F353900AFB96E /* agent.c in Sources */,
+                               DCE4E8BE1D7F353900AFB96E /* mechanism.c in Sources */,
+                               DCE4E8B41D7F353900AFB96E /* authdb.c in Sources */,
+                               DCE4E8B81D7F353900AFB96E /* ccaudit.c in Sources */,
+                               DCE4E8BD1D7F353900AFB96E /* main.c in Sources */,
+                               DCE4E8B71D7F353900AFB96E /* authutilities.c in Sources */,
+                               DCE4E8B61D7F353900AFB96E /* authtoken.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E8D91D7F39DB00AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D49111302095154B0066A1E4 /* MainMenu.xib in Sources */,
+                               DCE4E8F71D7F3A1100AFB96E /* KDCirclePeer.m in Sources */,
+                               DCE4E8F91D7F3A1100AFB96E /* KDAppDelegate.m in Sources */,
+                               DCE4E8F81D7F3A1100AFB96E /* main.m in Sources */,
+                               DCE4E8F61D7F3A1100AFB96E /* KDSecCircle.m in Sources */,
+                               DCE4E8FA1D7F3A1100AFB96E /* KDSecItems.m in Sources */,
+                               DCE4E8FB1D7F3A1100AFB96E /* NSArray+mapWithBlock.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCE4E90D1D7F3D5300AFB96E /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               D491112F2095154B0066A1E4 /* MainMenu.xib in Sources */,
+                               DCE4E92B1D7F3D7C00AFB96E /* KDSecCircle.m in Sources */,
+                               DCE4E92C1D7F3D7C00AFB96E /* KNPersistentState.m in Sources */,
+                               DCE4E9311D7F3D7C00AFB96E /* KDCirclePeer.m in Sources */,
+                               DCE4E92D1D7F3D7C00AFB96E /* NSArray+mapWithBlock.m in Sources */,
+                               DCE4E92F1D7F3D7C00AFB96E /* NSString+compactDescription.m in Sources */,
+                               DCE4E9301D7F3D7C00AFB96E /* main.m in Sources */,
+                               DCE4E92E1D7F3D7C00AFB96E /* NSDictionary+compactDescription.m in Sources */,
+                               DCE4E9321D7F3D7C00AFB96E /* KNAppDelegate.m in Sources */,
+                               DCE4E9331D7F3D7C00AFB96E /* NSSet+compactDescription.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF216D421ADD5B10029CCC1 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C0203E623A857C1005D0A68 /* OTEscrowRecord.proto in Sources */,
+                               BE7B8E132415579900E1CF4F /* SecSharedCredential.m in Sources */,
+                               EBDCC002233DD45700806566 /* MockAKSRefKey.proto in Sources */,
+                               0CE15E39222DF67800B7EAA4 /* OTRecovery.proto in Sources */,
+                               6C6AF17A221A06790091CE0A /* SecDbKeychainSerializedMetadataKey.proto in Sources */,
+                               DCE0775621ADD665002662FD /* OTPrivateKey.proto in Sources */,
+                               DCE0775321ADD65E002662FD /* OTAuthenticatedCiphertext.proto in Sources */,
+                               DCE0775521ADD663002662FD /* OTBottleContents.proto in Sources */,
+                               DCE0775421ADD661002662FD /* OTBottle.proto in Sources */,
+                               DCF216DE21ADD5F90029CCC1 /* CKKSSerializedKey.proto in Sources */,
+                               DCA992AD2400BB99007959AF /* TPPBAncientEpoch.proto in Sources */,
+                               DCF216DF21ADD5FB0029CCC1 /* OTPairingMessage.proto in Sources */,
+                               DCF216E121ADD6060029CCC1 /* TPPBVoucher.proto in Sources */,
+                               DCF216E021ADD5FD0029CCC1 /* OTAccountMetadataClassC.proto in Sources */,
+                               DCE0774721ADD63A002662FD /* TPPBDispositionEntry.proto in Sources */,
+                               BED079D22542A2C100FED203 /* CARevocationTests.m in Sources */,
+                               DCE0774621ADD638002662FD /* TPPBDisposition.proto in Sources */,
+                               DCE0774921ADD63E002662FD /* TPPBPolicyProhibits.proto in Sources */,
+                               DCE0774A21ADD640002662FD /* TPPBUnknownMachineID.proto in Sources */,
+                               1B8341B92239AD3A002BF18A /* TPPBPolicyKeyViewMapping.proto in Sources */,
+                               DCE0774C21ADD648002662FD /* TPPBPeerPermanentInfo.proto in Sources */,
+                               DCE0774D21ADD64A002662FD /* TPPBPolicySecret.proto in Sources */,
+                               DCE0774B21ADD642002662FD /* TPPBPeerStableInfo.proto in Sources */,
+                               DCE0774E21ADD64C002662FD /* TPPBPolicyDocument.proto in Sources */,
+                               5A47FFB3228F5E5500F781B8 /* KCInitialMessageData.proto in Sources */,
+                               DCE0775021ADD655002662FD /* TPPBPolicyModelToCategory.proto in Sources */,
+                               DCE0775121ADD658002662FD /* TPPBPolicyIntroducersByCategory.proto in Sources */,
+                               0C0D920C23BFEAB30070A68C /* OTCDPRecoveryInformation.proto in Sources */,
+                               DCE0774F21ADD651002662FD /* TPPBPolicyCategoriesByView.proto in Sources */,
+                               DC88466B22373A5E00738068 /* TPPBDictionaryMatchingRule.proto in Sources */,
+                               DCE0775221ADD65A002662FD /* TPPBPolicyRedaction.proto in Sources */,
+                               6C9791CB21C325C30074C609 /* SecDbBackupRecoverySet.proto in Sources */,
+                               DCE0774321ADD635002662FD /* TPPBPeerDynamicInfo.proto in Sources */,
+                               DCE0775721ADD669002662FD /* SecDbKeychainSerializedItemV7.proto in Sources */,
+                               DCE0775821ADD66B002662FD /* SecDbKeychainSerializedAKSWrappedKey.proto in Sources */,
+                               EB627A73233E339200F32437 /* MockAKSOptionalParameters.proto in Sources */,
+                               DC90A4C721F279D4001300EB /* SecEscrowPendingRecord.proto in Sources */,
+                               DCE0775921ADD66E002662FD /* SecDbKeychainSerializedMetadata.proto in Sources */,
+                               DCE0775A21ADD671002662FD /* SecDbKeychainSerializedSecretData.proto in Sources */,
+                               EB0E1B912358FAC6002B6037 /* SOSAccountConfiguration.proto in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF7830E1D88B4DE00E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF783F31D88B60D00E694BB /* pkcs12Derive.cpp in Sources */,
+                               DCF784CE1D88B62E00E694BB /* rc2_skey.c in Sources */,
+                               DCF7849F1D88B62D00E694BB /* bn_exp.c in Sources */,
+                               DCF784F31D88B62E00E694BB /* rsa_pk1.c in Sources */,
+                               DCF783EF1D88B60D00E694BB /* SHA1_MD5_Object.cpp in Sources */,
+                               DCF784BE1D88B62E00E694BB /* dh_lib.c in Sources */,
+                               DCF783D41D88B60D00E694BB /* cryptkitcsp.cpp in Sources */,
+                               DCF784A11D88B62D00E694BB /* bn_gcd.c in Sources */,
+                               DCF784BB1D88B62E00E694BB /* dh_err.c in Sources */,
+                               DCF7849B1D88B62D00E694BB /* bn_blind.c in Sources */,
+                               DCF784B61D88B62D00E694BB /* buf_err.c in Sources */,
+                               DCF784B71D88B62D00E694BB /* buffer.c in Sources */,
+                               DCF783E51D88B60D00E694BB /* DH_utils.cpp in Sources */,
+                               DCF784041D88B60D00E694BB /* miscAlgFactory.cpp in Sources */,
+                               DCF7849A1D88B62D00E694BB /* bn_asm.c in Sources */,
+                               DCF783DB1D88B60D00E694BB /* FEEKeys.cpp in Sources */,
+                               DCF784C51D88B62E00E694BB /* dsa_sign.c in Sources */,
+                               DCF783A21D88B60D00E694BB /* gladmanContext.cpp in Sources */,
+                               DCF783B51D88B60D00E694BB /* BlockCryptor.cpp in Sources */,
+                               DCF784071D88B60D00E694BB /* RSA_DSA_signature.cpp in Sources */,
+                               DCF784AB1D88B62D00E694BB /* bn_recp.c in Sources */,
+                               DCF784AD1D88B62D00E694BB /* bn_sqr.c in Sources */,
+                               DCF784091D88B60D00E694BB /* RSA_DSA_utils.cpp in Sources */,
+                               DCF783D91D88B60D00E694BB /* FEECSPUtils.cpp in Sources */,
+                               DCF784C01D88B62E00E694BB /* dsa_err.c in Sources */,
+                               DCF784CF1D88B62E00E694BB /* rc5_enc.c in Sources */,
+                               DCF784A71D88B62D00E694BB /* bn_prime.c in Sources */,
+                               DCF7839E1D88B60D00E694BB /* aescsp.cpp in Sources */,
+                               DCF784921D88B62D00E694BB /* bf_ecb.c in Sources */,
+                               DCF783E71D88B60D00E694BB /* HMACSHA1.c in Sources */,
+                               DCF784F61D88B62E00E694BB /* rsa_ssl.c in Sources */,
+                               DCF783E31D88B60D00E694BB /* DH_keys.cpp in Sources */,
+                               DCF784AC1D88B62D00E694BB /* bn_shift.c in Sources */,
+                               DCF784A51D88B62D00E694BB /* bn_mpi.c in Sources */,
+                               DCF784A61D88B62D00E694BB /* bn_mul.c in Sources */,
+                               DCF784BC1D88B62E00E694BB /* dh_gen.c in Sources */,
+                               DCF784061D88B60D00E694BB /* RSA_asymmetric.cpp in Sources */,
+                               DCF784EC1D88B62E00E694BB /* rsa_chk.c in Sources */,
+                               DCF783BC1D88B60D00E694BB /* MacContext.cpp in Sources */,
+                               DCF783ED1D88B60D00E694BB /* MD2Object.cpp in Sources */,
+                               DCF783A81D88B60D00E694BB /* vRijndael-alg-ref.c in Sources */,
+                               DCF783AC1D88B60D00E694BB /* AppleCSPContext.cpp in Sources */,
+                               DCF784BF1D88B62E00E694BB /* dsa_asn1.c in Sources */,
+                               DCF783A01D88B60D00E694BB /* boxes-ref.c in Sources */,
+                               DCF784151D88B60D00E694BB /* opensslUtils.cpp in Sources */,
+                               DCF783B91D88B60D00E694BB /* deriveKey.cpp in Sources */,
+                               DCF783FE1D88B60D00E694BB /* rc2Context.cpp in Sources */,
+                               DCF784121D88B60D00E694BB /* opensshWrap.cpp in Sources */,
+                               DCF783F11D88B60D00E694BB /* SHA2_Object.cpp in Sources */,
+                               DCF784A91D88B62D00E694BB /* bn_print.c in Sources */,
+                               DCF783A61D88B60D00E694BB /* rijndaelApi.c in Sources */,
+                               DCF783BA1D88B60D00E694BB /* DigestContext.cpp in Sources */,
+                               DCF784D11D88B62E00E694BB /* rc5_skey.c in Sources */,
+                               DCF784CA1D88B62E00E694BB /* lhash.c in Sources */,
+                               DCF784BD1D88B62E00E694BB /* dh_key.c in Sources */,
+                               DCF784C71D88B62E00E694BB /* err.c in Sources */,
+                               DCF783AE1D88B60D00E694BB /* AppleCSPKeys.cpp in Sources */,
+                               DCF784CB1D88B62E00E694BB /* mem.c in Sources */,
+                               DCF783D71D88B60D00E694BB /* FEEAsymmetricContext.cpp in Sources */,
+                               DCF783E11D88B60D00E694BB /* DH_exchange.cpp in Sources */,
+                               DCF783C31D88B60D00E694BB /* YarrowConnection.cpp in Sources */,
+                               DCF784A41D88B62D00E694BB /* bn_mont.c in Sources */,
+                               DCF783C11D88B60D00E694BB /* wrapKey.cpp in Sources */,
+                               DCF783BF1D88B60D00E694BB /* SignatureContext.cpp in Sources */,
+                               DCF784111D88B60D00E694BB /* opensshCoding.cpp in Sources */,
+                               DCF784C11D88B62E00E694BB /* dsa_gen.c in Sources */,
+                               DCF7840B1D88B60D00E694BB /* RSA_DSA_csp.cpp in Sources */,
+                               DCF783F71D88B60D00E694BB /* bfContext.cpp in Sources */,
+                               DCF783FB1D88B60D00E694BB /* desContext.cpp in Sources */,
+                               DCF784CC1D88B62E00E694BB /* rc2_cbc.c in Sources */,
+                               DCF784AA1D88B62D00E694BB /* bn_rand.c in Sources */,
+                               DCF784BA1D88B62E00E694BB /* dh_check.c in Sources */,
+                               DCF783A91D88B60D00E694BB /* AppleCSP.cpp in Sources */,
+                               DCF784C31D88B62E00E694BB /* dsa_lib.c in Sources */,
+                               DCF784971D88B62D00E694BB /* bio_lib.c in Sources */,
+                               DCF784C91D88B62E00E694BB /* ex_data.c in Sources */,
+                               DCF784C21D88B62E00E694BB /* dsa_key.c in Sources */,
+                               DCF784A31D88B62D00E694BB /* bn_lib.c in Sources */,
+                               DCF784961D88B62D00E694BB /* bf_skey.c in Sources */,
+                               DCF784F01D88B62E00E694BB /* rsa_lib.c in Sources */,
+                               DCF783AB1D88B60D00E694BB /* AppleCSPBuiltin.cpp in Sources */,
+                               DCF783D11D88B60D00E694BB /* ascContext.cpp in Sources */,
+                               DCF784981D88B62D00E694BB /* bss_file.c in Sources */,
+                               DCF784C81D88B62E00E694BB /* err_prn.c in Sources */,
+                               DCF784F11D88B62E00E694BB /* rsa_none.c in Sources */,
+                               DCF784B81D88B62D00E694BB /* cryptlib.c in Sources */,
+                               DCF783DF1D88B60D00E694BB /* DH_csp.cpp in Sources */,
+                               DCF784A01D88B62D00E694BB /* bn_exp2.c in Sources */,
+                               DCF7840D1D88B60D00E694BB /* RSA_DSA_keys.cpp in Sources */,
+                               DCF783B21D88B60D00E694BB /* AppleCSPUtils.cpp in Sources */,
+                               DCF784EE1D88B62E00E694BB /* rsa_err.c in Sources */,
+                               DCF783F91D88B60D00E694BB /* castContext.cpp in Sources */,
+                               DCF783F51D88B60D00E694BB /* pkcs8.cpp in Sources */,
+                               DCF783C21D88B60D00E694BB /* wrapKeyCms.cpp in Sources */,
+                               DCF7849E1D88B62D00E694BB /* bn_err.c in Sources */,
+                               DCF784131D88B60D00E694BB /* opensslAsn1.cpp in Sources */,
+                               DCF784991D88B62D00E694BB /* bn_add.c in Sources */,
+                               DCF784001D88B60D00E694BB /* rc4Context.cpp in Sources */,
+                               DCF783DD1D88B60D00E694BB /* FEESignatureObject.cpp in Sources */,
+                               DCF784C61D88B62E00E694BB /* dsa_vrf.c in Sources */,
+                               DCF784AE1D88B62D00E694BB /* bn_word.c in Sources */,
+                               DCF783A41D88B60D00E694BB /* rijndael-alg-ref.c in Sources */,
+                               DCF783E91D88B60D00E694BB /* pbkdDigest.cpp in Sources */,
+                               DCF784021D88B60D00E694BB /* rc5Context.cpp in Sources */,
+                               DCF783EB1D88B60D00E694BB /* pbkdf2.c in Sources */,
+                               DCF783B71D88B60D00E694BB /* cspdebugging.c in Sources */,
+                               DCF784ED1D88B62E00E694BB /* rsa_eay.c in Sources */,
+                               DCF784EF1D88B62E00E694BB /* rsa_gen.c in Sources */,
+                               DCF784F71D88B62E00E694BB /* stack.c in Sources */,
+                               DCF7849C1D88B62D00E694BB /* bn_ctx.c in Sources */,
+                               DCF784F51D88B62E00E694BB /* rsa_sign.c in Sources */,
+                               DCF784F21D88B62E00E694BB /* rsa_null.c in Sources */,
+                               DCF784931D88B62D00E694BB /* bf_enc.c in Sources */,
+                               DCF784F41D88B62E00E694BB /* rsa_saos.c in Sources */,
+                               DCF7849D1D88B62D00E694BB /* bn_div.c in Sources */,
+                               DCF784C41D88B62E00E694BB /* dsa_ossl.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF785601D88B95500E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF787221D88BA0100E694BB /* SSCSPSession.cpp in Sources */,
+                               DCF787261D88BA0100E694BB /* SSDLSession.cpp in Sources */,
+                               DCF7872A1D88BA0100E694BB /* SSKey.cpp in Sources */,
+                               DCF7871E1D88BA0100E694BB /* SSContext.cpp in Sources */,
+                               DCF787201D88BA0100E694BB /* SSCSPDLSession.cpp in Sources */,
+                               DCF7871C1D88BA0100E694BB /* CSPDLPlugin.cpp in Sources */,
+                               DCF787241D88BA0100E694BB /* SSDatabase.cpp in Sources */,
+                               DCF7871A1D88BA0100E694BB /* CSPDLDatabase.cpp in Sources */,
+                               DCF787281D88BA0100E694BB /* SSFactory.cpp in Sources */,
+                               DCF787301D88C18A00E694BB /* AppleCSPDLBuiltin.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF787AE1D88C86900E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF788361D88C8C400E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF788441D88C8FF00E694BB /* AppleDLBuiltin.cpp in Sources */,
+                               DCF788411D88C8DE00E694BB /* AppleFileDL.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF788491D88CA7200E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF788751D88CABC00E694BB /* AppleX509CL.cpp in Sources */,
+                               DCF788871D88CABC00E694BB /* clNssUtils.cpp in Sources */,
+                               DCF788921D88CABC00E694BB /* DecodedItem.cpp in Sources */,
+                               DCF788851D88CABC00E694BB /* clNameUtils.cpp in Sources */,
+                               DCF788951D88CABC00E694BB /* Session_Cert.cpp in Sources */,
+                               DCF788831D88CABC00E694BB /* CLFieldsCommon.cpp in Sources */,
+                               DCF7888C1D88CABC00E694BB /* DecodedCert.cpp in Sources */,
+                               DCF788771D88CABC00E694BB /* AppleX509CLBuiltin.cpp in Sources */,
+                               DCF7887B1D88CABC00E694BB /* CertFields.cpp in Sources */,
+                               DCF788791D88CABC00E694BB /* AppleX509CLSession.cpp in Sources */,
+                               DCF7888A1D88CABC00E694BB /* CSPAttacher.cpp in Sources */,
+                               DCF788801D88CABC00E694BB /* CLCrlExtensions.cpp in Sources */,
+                               DCF788781D88CABC00E694BB /* AppleX509CLPlugin.cpp in Sources */,
+                               DCF7887C1D88CABC00E694BB /* CLCachedEntry.cpp in Sources */,
+                               DCF7888E1D88CABC00E694BB /* DecodedCrl.cpp in Sources */,
+                               DCF788891D88CABC00E694BB /* CrlFields.cpp in Sources */,
+                               DCF788981D88CABC00E694BB /* Session_CSR.cpp in Sources */,
+                               DCF788961D88CABC00E694BB /* Session_CRL.cpp in Sources */,
+                               DCF788901D88CABC00E694BB /* DecodedExtensions.cpp in Sources */,
+                               DCF7887E1D88CABC00E694BB /* CLCertExtensions.cpp in Sources */,
+                               DCF788971D88CABC00E694BB /* Session_Crypto.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF788991D88CB5200E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF788A51D88CB6800E694BB /* AppleX509CLPlugin.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               DCF788BC1D88CD2400E694BB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DCF789341D88CD6700E694BB /* TPDatabase.cpp in Sources */,
+                               DCF7892B1D88CD6700E694BB /* TPCertInfo.cpp in Sources */,
+                               DCF789211D88CD6700E694BB /* AppleTP.cpp in Sources */,
+                               DCF789391D88CD6700E694BB /* ocspRequest.cpp in Sources */,
+                               DCF789371D88CD6700E694BB /* TPNetwork.cpp in Sources */,
+                               DCF789321D88CD6700E694BB /* tpCrlVerify.cpp in Sources */,
+                               DCF789231D88CD6700E694BB /* AppleTPSession.cpp in Sources */,
+                               DCF789281D88CD6700E694BB /* cuEnc64.c in Sources */,
+                               DCF789411D88CD6700E694BB /* tpPolicies.cpp in Sources */,
+                               DCF789481D88D17C00E694BB /* AppleX509TPBuiltin.cpp in Sources */,
+                               DCF7893F1D88CD6700E694BB /* tpOcspVerify.cpp in Sources */,
+                               DCF789301D88CD6700E694BB /* TPCrlInfo.cpp in Sources */,
+                               DCF789431D88CD6700E694BB /* tpTime.c in Sources */,
+                               DCF789261D88CD6700E694BB /* certGroupUtils.cpp in Sources */,
+                               DCF7893B1D88CD6700E694BB /* tpOcspCache.cpp in Sources */,
+                               DCF7892A1D88CD6700E694BB /* tpCertGroup.cpp in Sources */,
+                               DCF7893D1D88CD6700E694BB /* tpOcspCertVfy.cpp in Sources */,
+                               DCF7892F1D88CD6700E694BB /* tpCredRequest.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1982124780E0025B833 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB3F9C9D21FCFD67007B6EBA /* OctagonTestHarness.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1A32124780F0025B833 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               E060D24721247C680025B833 /* OctagonTestHarnessXPCServiceProtocol.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E060D1B3212478110025B833 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               E09E09EB215506650042C7D3 /* OctagonTestHarnessXPCService.m in Sources */,
+                               EBFF95ED214C80880021CD14 /* SecRemoteDevice.m in Sources */,
+                               E060D1BF212478120025B833 /* main.m in Sources */,
+                               EBFF95EE214C80B90021CD14 /* OctagonTestHarnessXPCServiceDelegate.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E710C73E1331946400F85568 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               476541A31F33EDCC00413F65 /* SecdWatchdog.m in Sources */,
+                               4CC92B1C15A3BF2F00C6D578 /* testmain.c in Sources */,
+                               0C78F1CC16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */,
+                               DCCD33D11E3FEF2C00AA4AD1 /* spi.c in Sources */,
+                               DCB221541E8B08BE001598BC /* server_xpc.m in Sources */,
+                               DC42690D1E82FD9B002B7110 /* server_security_helpers.m in Sources */,
+                               DC4268FC1E820370002B7110 /* server_endpoint.m in Sources */,
+                               DC5F35AB1EE0F27100900966 /* server_entitlement_helpers.c in Sources */,
+                               0C78F1CE16A5E1BF00654E08 /* sectask_ipc.defs in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E7B01BC2166594AB000485F1 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E7D847C01C6BE9710025BB44 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB413B801E663AEB00592085 /* PairingChannel.m in Sources */,
+                               0CB72D9E21E42FCF00D8BC9B /* OTPairingMessage.m in Sources */,
+                               0C3C47C624902D960084B951 /* OTSupportOctagonMessage.m in Sources */,
+                               0CB72DA121E42FCF00D8BC9B /* OTSponsorToApplicantRound2M2.m in Sources */,
+                               E7F480151C73980D00390FDB /* KCJoiningRequestSecretSession.m in Sources */,
+                               E7F480331C73FC4C00390FDB /* KCAESGCMDuplexSession.m in Sources */,
+                               DC6063B221B09AB200069B82 /* KCJoiningRequestCircleSession.m in Sources */,
+                               E794BB001C7598F900339A0F /* KCJoiningMessages.m in Sources */,
+                               5A47FFB9228F5F2A00F781B8 /* KCInitialMessageData.m in Sources */,
+                               0CB72DA021E42FCF00D8BC9B /* OTSponsorToApplicantRound1M2.m in Sources */,
+                               E794BA6F1C7424D800339A0F /* KCDer.m in Sources */,
+                               E7E3EFBA1CBC192A00E79A5D /* KCAccountKCCircleDelegate.m in Sources */,
+                               E7F482AC1C7558F700390FDB /* KCJoiningAcceptSession.m in Sources */,
+                               E71454F01C741E0800B5B20B /* KCError.m in Sources */,
+                               E772FD471CC15EFA00D63E41 /* NSData+SecRandom.m in Sources */,
+                               0C3C47C724902D960084B951 /* OTSupportSOSMessage.m in Sources */,
+                               0CB72D9D21E42FCF00D8BC9B /* OTApplicantToSponsorRound2M1.m in Sources */,
+                               E7F482AA1C7554FB00390FDB /* NSError+KCCreationHelpers.m in Sources */,
+                               E75C0E831C6FC31D00E6953B /* KCSRPContext.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               E7D847CA1C6BE9720025BB44 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               E7F4809C1C74E85200390FDB /* KCDerTest.m in Sources */,
+                               E7D848051C6BEFCD0025BB44 /* KCSRPTests.m in Sources */,
+                               E7F4809E1C74E86D00390FDB /* KCAESGCMTest.m in Sources */,
+                               52DA3C7123C7E63600FEEDFF /* KCTLKRequestTest.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB0BC9371C3C791500785842 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB0BC9671C3C798600785842 /* secedumodetest.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB1055711E14DF430003C309 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB1055791E14DF570003C309 /* SecCertificateFuzzer.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB108F251E6CE4D2003B0456 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C5258BA21BB062F00B32C96 /* FakeSOSControl.m in Sources */,
+                               EB108F261E6CE4D2003B0456 /* KCPairingTest.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB27FF0D1E402CD300EC9E3A /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               DC5BCC481E53820200649140 /* SecArgParse.c in Sources */,
+                               EB27FF2D1E407FF600EC9E3A /* ckksctl.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB2D54A21F02A45E00E46890 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB2D54AB1F02A47200E46890 /* SecAtomicFile.cpp in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB425C9F1C65846D000ECE53 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB425CCF1C658554000ECE53 /* secbackuptest.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB433A211CC3243600A7EACE /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB433A291CC3244C00A7EACE /* secitemstresstest.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB49B2AA202D877F003F34A0 /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */,
+                               EB1E069D211E16260088F0B1 /* mockaksxcbase.m in Sources */,
+                               EB49B2DB202DF20F003F34A0 /* spi.c in Sources */,
+                               EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */,
+                               EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */,
+                               EBC73F2720993FC900AE3350 /* SFAnalyticsMultiSampler.m in Sources */,
+                               EB49B2D8202DF1F7003F34A0 /* server_xpc.m in Sources */,
+                               EB49B2D9202DF1F7003F34A0 /* server_security_helpers.m in Sources */,
+                               EBC73F2B2099785900AE3350 /* SFObjCType.m in Sources */,
+                               480ADDB22155A0CE00318FC6 /* SOSAnalytics.m in Sources */,
+                               A6C737C023F37AB90009C930 /* entitlements.c in Sources */,
+                               EB49B2E0202DF5D7003F34A0 /* server_entitlement_helpers.c in Sources */,
+                               5A061196229ED6E8006AF14A /* NSDate+SFAnalytics.m in Sources */,
+                               EBC73F2A20996AD400AE3350 /* SFSQLiteStatement.m in Sources */,
+                               EB6667C7204CD69F000B404F /* testPlistDER.m in Sources */,
+                               EBC73F29209966AF00AE3350 /* SFSQLite.m in Sources */,
+                               EB49B2D5202DF1D8003F34A0 /* SecTask.c in Sources */,
+                               EB49B2D3202DF1AC003F34A0 /* SecdWatchdog.m in Sources */,
+                               EB49B2B1202D8780003F34A0 /* mockaksKeychain.m in Sources */,
+                               EB1E069F211E17C00088F0B1 /* mockaksWatchDog.m in Sources */,
+                               EB49B2D1202DF15F003F34A0 /* SFAnalyticsActivityTracker.m in Sources */,
+                               EB49B2D0202DF14D003F34A0 /* SFAnalytics.m in Sources */,
+                               EBC73F2820993FDA00AE3350 /* SFAnalyticsSampler.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB69528D223B75C300F02C1C /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCD8A19D1E09EEC800E4FA0A /* SOSBackupSliceKeyBag.m in Sources */,
-                               DC2670FB1F3E72C000816EED /* SOSCircleDer.c in Sources */,
-                               EB75B4961E75A44100E469CC /* SOSPiggyback.m in Sources */,
-                               DCD8A1B31E09F12D00E4FA0A /* SOSCircle.c in Sources */,
-                               DCD8A1FF1E09FA6100E4FA0A /* secViewDisplay.c in Sources */,
-                               DCD8A1B41E09F12D00E4FA0A /* SOSCircleV2.c in Sources */,
-                               DCD8A1A01E09EF3500E4FA0A /* SOSCloudKeychainClient.c in Sources */,
-                               DCD8A1DB1E09F5D100E4FA0A /* SOSAccountTrust.m in Sources */,
-                               DCD8A1A11E09EF5C00E4FA0A /* SOSCloudKeychainConstants.c in Sources */,
-                               DCD8A1A91E09F04700E4FA0A /* SOSECWrapUnwrap.c in Sources */,
-                               DCD8A1BD1E09F1D600E4FA0A /* SOSFullPeerInfo.m in Sources */,
-                               DCD8A1B51E09F15400E4FA0A /* SOSGenCount.c in Sources */,
-                               DCD8A19F1E09EF0F00E4FA0A /* SOSInternal.m in Sources */,
-                               EBEEEE3F1EA31E6D00E15F5C /* SOSControlHelper.m in Sources */,
-                               DCD8A1A61E09EFD700E4FA0A /* SOSKVSKeys.m in Sources */,
-                               DCD8A1B61E09F16C00E4FA0A /* SOSKeyedPubKeyIdentifier.c in Sources */,
-                               DCD8A1321E09EE0F00E4FA0A /* SOSPeerInfo.m in Sources */,
-                               DCD8A1A41E09EF9000E4FA0A /* SOSPeerInfoCollections.c in Sources */,
-                               DCD8A1B11E09F11900E4FA0A /* SOSPeerInfoDER.m in Sources */,
-                               0CE7604C1E12F56800B4381E /* SOSAccountTrustClassic+Identity.m in Sources */,
-                               DCD8A1B21E09F11900E4FA0A /* SOSPeerInfoRingState.m in Sources */,
-                               0CE7604E1E12F5BA00B4381E /* SOSAccountTrustClassic+Retirement.m in Sources */,
-                               DCD8A1A51E09EFAE00E4FA0A /* SOSPeerInfoV2.m in Sources */,
-                               DCD8A1C21E09F23B00E4FA0A /* SOSRecoveryKeyBag.m in Sources */,
-                               DCD8A1B81E09F1BB00E4FA0A /* SOSRingBackup.m in Sources */,
-                               DCD8A1B91E09F1BB00E4FA0A /* SOSRingBasic.m in Sources */,
-                               DCD8A1BB1E09F1BB00E4FA0A /* SOSRingConcordanceTrust.c in Sources */,
-                               DCD8A1AE1E09F0C500E4FA0A /* SOSRingDER.c in Sources */,
-                               DCD8A1BC1E09F1BB00E4FA0A /* SOSRingPeerInfoUtils.c in Sources */,
-                               DCD8A1BA1E09F1BB00E4FA0A /* SOSRingRecovery.m in Sources */,
-                               DCD8A1B01E09F0F400E4FA0A /* SOSRingTypes.m in Sources */,
-                               DCD8A1AF1E09F0DC00E4FA0A /* SOSRingUtils.c in Sources */,
-                               DCD8A1B71E09F19100E4FA0A /* SOSRingV0.m in Sources */,
-                               DCD8A1C71E09F2B400E4FA0A /* SOSTransport.m in Sources */,
-                               DCD8A1511E09EE0F00E4FA0A /* SOSViews.m in Sources */,
-                               DCD8A19E1E09EEDA00E4FA0A /* SecRecoveryKey.m in Sources */,
+                               D4BD5E83228A6823001650A7 /* util.m in Sources */,
+                               EB69528E223B75C300F02C1C /* SecDbItem.c in Sources */,
+                               EB69528F223B75C300F02C1C /* SecAKSObjCWrappers.m in Sources */,
+                               EB695290223B75C300F02C1C /* SFKeychainControlManager.m in Sources */,
+                               EB695291223B75C300F02C1C /* SecDbKeychainSerializedSecretData.m in Sources */,
+                               EB695294223B75C300F02C1C /* spi.c in Sources */,
+                               EB695295223B75C300F02C1C /* SecItemDb.c in Sources */,
+                               EB695296223B75C300F02C1C /* SecKeybagSupport.c in Sources */,
+                               EB695297223B75C300F02C1C /* SecDbKeychainMetadataKeyStore.m in Sources */,
+                               EB695298223B75C300F02C1C /* SecdWatchdog.m in Sources */,
+                               EB69529A223B75C300F02C1C /* CheckV12DevEnabled.m in Sources */,
+                               EB69529B223B75C300F02C1C /* SecDbBackupManager.m in Sources */,
+                               EB69529C223B75C300F02C1C /* server.c in Sources */,
+                               EB69529D223B75C300F02C1C /* SecItemSchema.c in Sources */,
+                               EB69529E223B75C300F02C1C /* server_entitlement_helpers.c in Sources */,
+                               EB69529F223B75C300F02C1C /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
+                               EB6952A0223B75C300F02C1C /* SecItemServer.c in Sources */,
+                               EB6952A1223B75C300F02C1C /* SecDbKeychainItem.m in Sources */,
+                               EB6952A2223B75C300F02C1C /* server_security_helpers.m in Sources */,
+                               EB6952A3223B75C300F02C1C /* SecDbKeychainSerializedMetadata.m in Sources */,
+                               EB6952A4223B75C300F02C1C /* server_xpc.m in Sources */,
+                               EB6952A5223B75C300F02C1C /* SecDbKeychainSerializedItemV7.m in Sources */,
+                               EB6952A6223B75C300F02C1C /* SecDbQuery.c in Sources */,
+                               6C2138C4225183FE007DEDD3 /* SecDbKeychainSerializedMetadataKey.m in Sources */,
+                               EB6952A7223B75C300F02C1C /* SecuritydXPC.c in Sources */,
+                               EB6952A8223B75C300F02C1C /* server_endpoint.m in Sources */,
+                               EB6952A9223B75C300F02C1C /* SecDbKeychainItemV7.m in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               EB74CC122207E48000F1BBAD /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               EB74CC242207EB9800F1BBAD /* KeychainSettings.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E6911D7A37FA00AFB96E /* Sources */ = {
+               EB89086721F17D3C00F0DDDB /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCE4E6921D7A37FA00AFB96E /* security_tool_commands.c in Sources */,
-                               DCE4E6931D7A37FA00AFB96E /* NSFileHandle+Formatting.m in Sources */,
+                               EB8908AA21F18BBF00F0DDDB /* SecDbItem.c in Sources */,
+                               EB8908BA21F1957300F0DDDB /* SecAKSObjCWrappers.m in Sources */,
+                               EB8908BE21F2181600F0DDDB /* SFKeychainControlManager.m in Sources */,
+                               EB8908B721F1943200F0DDDB /* SecDbKeychainSerializedSecretData.m in Sources */,
+                               EB89086821F17D3C00F0DDDB /* spi.c in Sources */,
+                               EB8908A721F1882300F0DDDB /* SecItemDb.c in Sources */,
+                               EB8908AB21F18BFD00F0DDDB /* SecKeybagSupport.c in Sources */,
+                               EB8908B121F18DB600F0DDDB /* SecDbKeychainMetadataKeyStore.m in Sources */,
+                               EB89086921F17D3C00F0DDDB /* SecdWatchdog.m in Sources */,
+                               EB8908B921F1953100F0DDDB /* CheckV12DevEnabled.m in Sources */,
+                               6C7094CC2239D21E00C5DAC6 /* SecDbBackupManager.m in Sources */,
+                               EB89086A21F17D3C00F0DDDB /* server.c in Sources */,
+                               EB8908AC21F18C4200F0DDDB /* SecItemSchema.c in Sources */,
+                               D4BD5E87228A6856001650A7 /* util.m in Sources */,
+                               EB89086B21F17D3C00F0DDDB /* server_entitlement_helpers.c in Sources */,
+                               EB8908B821F1944500F0DDDB /* SecDbKeychainSerializedAKSWrappedKey.m in Sources */,
+                               EB8908A921F1888300F0DDDB /* SecItemServer.c in Sources */,
+                               EB8908AE21F18D0E00F0DDDB /* SecDbKeychainItem.m in Sources */,
+                               EB89086C21F17D3C00F0DDDB /* server_security_helpers.m in Sources */,
+                               EB8908B021F18D7B00F0DDDB /* SecDbKeychainSerializedMetadata.m in Sources */,
+                               EB89086D21F17D3C00F0DDDB /* server_xpc.m in Sources */,
+                               6C6AF181221A070C0091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */,
+                               EB8908B221F18E1400F0DDDB /* SecDbKeychainSerializedItemV7.m in Sources */,
+                               EB8908A821F1886100F0DDDB /* SecDbQuery.c in Sources */,
+                               EB8908AD21F18CEF00F0DDDB /* SecuritydXPC.c in Sources */,
+                               EB89086E21F17D3C00F0DDDB /* server_endpoint.m in Sources */,
+                               EB8908AF21F18D3500F0DDDB /* SecDbKeychainItemV7.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E74C1D7A43B500AFB96E /* Sources */ = {
+               EB9C1D761BDFD0E000F89272 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */,
-                               DCE4E7B61D7A440A00AFB96E /* bc-10-knife-on-bread.m in Sources */,
+                               EB9C1D7E1BDFD0E100F89272 /* secbackupntest.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E7C81D7A4AED00AFB96E /* Sources */ = {
+               EBA9AA7E1CE30E58004E2B68 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */,
-                               DCE4E7DF1D7A4B4C00AFB96E /* bc-10-knife-on-bread.m in Sources */,
+                               EBA9AA871CE30E6F004E2B68 /* secitemnotifications.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E7F21D7A4DA800AFB96E /* Sources */ = {
+               EBB839A11E29665D00853BAC /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCCD33CE1E3FEF1700AA4AD1 /* spi.c in Sources */,
-                               476541701F33B59300413F65 /* SecdWatchdog.m in Sources */,
-                               DCE4E8071D7A4DE200AFB96E /* server.c in Sources */,
-                               DC5F35A61EE0F25000900966 /* server_entitlement_helpers.c in Sources */,
-                               DC4269081E82FD8B002B7110 /* server_security_helpers.c in Sources */,
-                               DCB221501E8B08A5001598BC /* server_xpc.m in Sources */,
-                               DC6ACC461E81E08D00125DC5 /* server_endpoint.m in Sources */,
+                               EBB839B01E2968AB00853BAC /* secfuzzer.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E8381D7A57AE00AFB96E /* Sources */ = {
+               EBB851E822F7912400424FD0 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               D4BEECE81E93094500F76D1A /* trustd.c in Sources */,
-                               DC5F35A91EE0F25300900966 /* server_entitlement_helpers.c in Sources */,
+                               EBB8520A22F7914A00424FD0 /* SecTapToRadarTests.m in Sources */,
+                               EBB8520922F7914A00424FD0 /* SecXPCHelperTests.m in Sources */,
+                               EBB852D022F7A13D00424FD0 /* SecInternalRelease.c in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E8901D7F34F600AFB96E /* Sources */ = {
+               EBCF73F41CE45F9C00BED7CA /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCE4E8C21D7F353900AFB96E /* server.c in Sources */,
-                               DCE4E8BA1D7F353900AFB96E /* credential.c in Sources */,
-                               DCE4E8BF1D7F353900AFB96E /* object.c in Sources */,
-                               DCE4E8B51D7F353900AFB96E /* authitems.c in Sources */,
-                               DCE4E8B91D7F353900AFB96E /* crc.c in Sources */,
-                               DCE4E8C31D7F353900AFB96E /* session.c in Sources */,
-                               DCE4E8BC1D7F353900AFB96E /* engine.c in Sources */,
-                               DCE4E8C41D7F353900AFB96E /* connection.c in Sources */,
-                               DCE4E8C11D7F353900AFB96E /* rule.c in Sources */,
-                               DCE4E8C01D7F353900AFB96E /* process.c in Sources */,
-                               DCE4E8B31D7F353900AFB96E /* agent.c in Sources */,
-                               DCE4E8BE1D7F353900AFB96E /* mechanism.c in Sources */,
-                               DCE4E8B41D7F353900AFB96E /* authdb.c in Sources */,
-                               DCE4E8B81D7F353900AFB96E /* ccaudit.c in Sources */,
-                               DCE4E8BD1D7F353900AFB96E /* main.c in Sources */,
-                               DCE4E8B71D7F353900AFB96E /* authutilities.c in Sources */,
-                               DCE4E8B61D7F353900AFB96E /* authtoken.c in Sources */,
+                               EBCF73FD1CE45FAC00BED7CA /* secitemfunctionality.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E8D91D7F39DB00AFB96E /* Sources */ = {
+               EBF3746E1DC055580065D840 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               D49111302095154B0066A1E4 /* MainMenu.xib in Sources */,
-                               DCE4E8F71D7F3A1100AFB96E /* KDCirclePeer.m in Sources */,
-                               DCE4E8F91D7F3A1100AFB96E /* KDAppDelegate.m in Sources */,
-                               DCE4E8F81D7F3A1100AFB96E /* main.m in Sources */,
-                               DCE4E8F61D7F3A1100AFB96E /* KDSecCircle.m in Sources */,
-                               DCE4E8FA1D7F3A1100AFB96E /* KDSecItems.m in Sources */,
-                               DCE4E8FB1D7F3A1100AFB96E /* NSArray+mapWithBlock.m in Sources */,
+                               EBF374751DC055590065D840 /* security-sysdiagnose.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCE4E90D1D7F3D5300AFB96E /* Sources */ = {
+               F621D02A1ED6DCE7000EA569 /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               D491112F2095154B0066A1E4 /* MainMenu.xib in Sources */,
-                               DCE4E92B1D7F3D7C00AFB96E /* KDSecCircle.m in Sources */,
-                               DCE4E92C1D7F3D7C00AFB96E /* KNPersistentState.m in Sources */,
-                               DCE4E9311D7F3D7C00AFB96E /* KDCirclePeer.m in Sources */,
-                               DCE4E92D1D7F3D7C00AFB96E /* NSArray+mapWithBlock.m in Sources */,
-                               DCE4E92F1D7F3D7C00AFB96E /* NSString+compactDescription.m in Sources */,
-                               DCE4E9301D7F3D7C00AFB96E /* main.m in Sources */,
-                               DCE4E92E1D7F3D7C00AFB96E /* NSDictionary+compactDescription.m in Sources */,
-                               DCE4E9321D7F3D7C00AFB96E /* KNAppDelegate.m in Sources */,
-                               DCE4E9331D7F3D7C00AFB96E /* NSSet+compactDescription.m in Sources */,
+                               F619D71E1ED70BC1005B5F46 /* main.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCF7830E1D88B4DE00E694BB /* Sources */ = {
+               F667EC571E96E9B100203D5C /* Sources */ = {

                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (

-                               DCF783F31D88B60D00E694BB /* pkcs12Derive.cpp in Sources */,
-                               DCF784CE1D88B62E00E694BB /* rc2_skey.c in Sources */,
-                               DCF7849F1D88B62D00E694BB /* bn_exp.c in Sources */,
-                               DCF784F31D88B62E00E694BB /* rsa_pk1.c in Sources */,
-                               DCF783EF1D88B60D00E694BB /* SHA1_MD5_Object.cpp in Sources */,
-                               DCF784BE1D88B62E00E694BB /* dh_lib.c in Sources */,
-                               DCF783D41D88B60D00E694BB /* cryptkitcsp.cpp in Sources */,
-                               DCF784A11D88B62D00E694BB /* bn_gcd.c in Sources */,
-                               DCF784BB1D88B62E00E694BB /* dh_err.c in Sources */,
-                               DCF7849B1D88B62D00E694BB /* bn_blind.c in Sources */,
-                               DCF784B61D88B62D00E694BB /* buf_err.c in Sources */,
-                               DCF784B71D88B62D00E694BB /* buffer.c in Sources */,
-                               DCF783E51D88B60D00E694BB /* DH_utils.cpp in Sources */,
-                               DCF784041D88B60D00E694BB /* miscAlgFactory.cpp in Sources */,
-                               DCF7849A1D88B62D00E694BB /* bn_asm.c in Sources */,
-                               DCF783DB1D88B60D00E694BB /* FEEKeys.cpp in Sources */,
-                               DCF784C51D88B62E00E694BB /* dsa_sign.c in Sources */,
-                               DCF783A21D88B60D00E694BB /* gladmanContext.cpp in Sources */,
-                               DCF783B51D88B60D00E694BB /* BlockCryptor.cpp in Sources */,
-                               DCF784071D88B60D00E694BB /* RSA_DSA_signature.cpp in Sources */,
-                               DCF784AB1D88B62D00E694BB /* bn_recp.c in Sources */,
-                               DCF784AD1D88B62D00E694BB /* bn_sqr.c in Sources */,
-                               DCF784091D88B60D00E694BB /* RSA_DSA_utils.cpp in Sources */,
-                               DCF783D91D88B60D00E694BB /* FEECSPUtils.cpp in Sources */,
-                               DCF784C01D88B62E00E694BB /* dsa_err.c in Sources */,
-                               DCF784CF1D88B62E00E694BB /* rc5_enc.c in Sources */,
-                               DCF784A71D88B62D00E694BB /* bn_prime.c in Sources */,
-                               DCF7839E1D88B60D00E694BB /* aescsp.cpp in Sources */,
-                               DCF783C61D88B60D00E694BB /* bsafeAsymmetric.cpp in Sources */,
-                               DCF784921D88B62D00E694BB /* bf_ecb.c in Sources */,
-                               DCF783E71D88B60D00E694BB /* HMACSHA1.c in Sources */,
-                               DCF784F61D88B62E00E694BB /* rsa_ssl.c in Sources */,
-                               DCF783CA1D88B60D00E694BB /* bsafeKeyGen.cpp in Sources */,
-                               DCF783E31D88B60D00E694BB /* DH_keys.cpp in Sources */,
-                               DCF784AC1D88B62D00E694BB /* bn_shift.c in Sources */,
-                               DCF784A51D88B62D00E694BB /* bn_mpi.c in Sources */,
-                               DCF784A61D88B62D00E694BB /* bn_mul.c in Sources */,
-                               DCF784BC1D88B62E00E694BB /* dh_gen.c in Sources */,
-                               DCF784061D88B60D00E694BB /* RSA_asymmetric.cpp in Sources */,
-                               DCF784EC1D88B62E00E694BB /* rsa_chk.c in Sources */,
-                               DCF783BC1D88B60D00E694BB /* MacContext.cpp in Sources */,
-                               DCF783ED1D88B60D00E694BB /* MD2Object.cpp in Sources */,
-                               DCF783A81D88B60D00E694BB /* vRijndael-alg-ref.c in Sources */,
-                               DCF783AC1D88B60D00E694BB /* AppleCSPContext.cpp in Sources */,
-                               DCF784BF1D88B62E00E694BB /* dsa_asn1.c in Sources */,
-                               DCF783A01D88B60D00E694BB /* boxes-ref.c in Sources */,
-                               DCF784151D88B60D00E694BB /* opensslUtils.cpp in Sources */,
-                               DCF783B91D88B60D00E694BB /* deriveKey.cpp in Sources */,
-                               DCF783FE1D88B60D00E694BB /* rc2Context.cpp in Sources */,
-                               DCF784121D88B60D00E694BB /* opensshWrap.cpp in Sources */,
-                               DCF783F11D88B60D00E694BB /* SHA2_Object.cpp in Sources */,
-                               DCF784A91D88B62D00E694BB /* bn_print.c in Sources */,
-                               DCF783A61D88B60D00E694BB /* rijndaelApi.c in Sources */,
-                               DCF783BA1D88B60D00E694BB /* DigestContext.cpp in Sources */,
-                               DCF784D11D88B62E00E694BB /* rc5_skey.c in Sources */,
-                               DCF784CA1D88B62E00E694BB /* lhash.c in Sources */,
-                               DCF784BD1D88B62E00E694BB /* dh_key.c in Sources */,
-                               DCF784C71D88B62E00E694BB /* err.c in Sources */,
-                               DCF783AE1D88B60D00E694BB /* AppleCSPKeys.cpp in Sources */,
-                               DCF784CB1D88B62E00E694BB /* mem.c in Sources */,
-                               DCF783D71D88B60D00E694BB /* FEEAsymmetricContext.cpp in Sources */,
-                               DCF783D01D88B60D00E694BB /* miscalgorithms.cpp in Sources */,
-                               DCF783E11D88B60D00E694BB /* DH_exchange.cpp in Sources */,
-                               DCF783C31D88B60D00E694BB /* YarrowConnection.cpp in Sources */,
-                               DCF784A41D88B62D00E694BB /* bn_mont.c in Sources */,
-                               DCF783C11D88B60D00E694BB /* wrapKey.cpp in Sources */,
-                               DCF783BF1D88B60D00E694BB /* SignatureContext.cpp in Sources */,
-                               DCF784111D88B60D00E694BB /* opensshCoding.cpp in Sources */,
-                               DCF784C11D88B62E00E694BB /* dsa_gen.c in Sources */,
-                               DCF7840B1D88B60D00E694BB /* RSA_DSA_csp.cpp in Sources */,
-                               DCF783F71D88B60D00E694BB /* bfContext.cpp in Sources */,
-                               DCF783FB1D88B60D00E694BB /* desContext.cpp in Sources */,
-                               DCF784CC1D88B62E00E694BB /* rc2_cbc.c in Sources */,
-                               DCF784AA1D88B62D00E694BB /* bn_rand.c in Sources */,
-                               DCF784BA1D88B62E00E694BB /* dh_check.c in Sources */,
-                               DCF783A91D88B60D00E694BB /* AppleCSP.cpp in Sources */,
-                               DCF784C31D88B62E00E694BB /* dsa_lib.c in Sources */,
-                               DCF784971D88B62D00E694BB /* bio_lib.c in Sources */,
-                               DCF784C91D88B62E00E694BB /* ex_data.c in Sources */,
-                               DCF784C21D88B62E00E694BB /* dsa_key.c in Sources */,
-                               DCF784A31D88B62D00E694BB /* bn_lib.c in Sources */,
-                               DCF784961D88B62D00E694BB /* bf_skey.c in Sources */,
-                               DCF784F01D88B62E00E694BB /* rsa_lib.c in Sources */,
-                               DCF783AB1D88B60D00E694BB /* AppleCSPBuiltin.cpp in Sources */,
-                               DCF783D11D88B60D00E694BB /* ascContext.cpp in Sources */,
-                               DCF784981D88B62D00E694BB /* bss_file.c in Sources */,
-                               DCF784C81D88B62E00E694BB /* err_prn.c in Sources */,
-                               DCF784F11D88B62E00E694BB /* rsa_none.c in Sources */,
-                               DCF784B81D88B62D00E694BB /* cryptlib.c in Sources */,
-                               DCF783DF1D88B60D00E694BB /* DH_csp.cpp in Sources */,
-                               DCF784A01D88B62D00E694BB /* bn_exp2.c in Sources */,
-                               DCF7840D1D88B60D00E694BB /* RSA_DSA_keys.cpp in Sources */,
-                               DCF783CB1D88B60D00E694BB /* bsafePKCS1.cpp in Sources */,
-                               DCF783B21D88B60D00E694BB /* AppleCSPUtils.cpp in Sources */,
-                               DCF784EE1D88B62E00E694BB /* rsa_err.c in Sources */,
-                               DCF783F91D88B60D00E694BB /* castContext.cpp in Sources */,
-                               DCF783F51D88B60D00E694BB /* pkcs8.cpp in Sources */,
-                               DCF783C21D88B60D00E694BB /* wrapKeyCms.cpp in Sources */,
-                               DCF7849E1D88B62D00E694BB /* bn_err.c in Sources */,
-                               DCF784131D88B60D00E694BB /* opensslAsn1.cpp in Sources */,
-                               DCF784991D88B62D00E694BB /* bn_add.c in Sources */,
-                               DCF784001D88B60D00E694BB /* rc4Context.cpp in Sources */,
-                               DCF783C71D88B60D00E694BB /* bsafeContext.cpp in Sources */,
-                               DCF783DD1D88B60D00E694BB /* FEESignatureObject.cpp in Sources */,
-                               DCF784C61D88B62E00E694BB /* dsa_vrf.c in Sources */,
-                               DCF784AE1D88B62D00E694BB /* bn_word.c in Sources */,
-                               DCF783A41D88B60D00E694BB /* rijndael-alg-ref.c in Sources */,
-                               DCF783CF1D88B60D00E694BB /* memory.cpp in Sources */,
-                               DCF783E91D88B60D00E694BB /* pbkdDigest.cpp in Sources */,
-                               DCF784021D88B60D00E694BB /* rc5Context.cpp in Sources */,
-                               DCF783EB1D88B60D00E694BB /* pbkdf2.c in Sources */,
-                               DCF783B71D88B60D00E694BB /* cspdebugging.c in Sources */,
-                               DCF784ED1D88B62E00E694BB /* rsa_eay.c in Sources */,
-                               DCF784EF1D88B62E00E694BB /* rsa_gen.c in Sources */,
-                               DCF783CD1D88B60D00E694BB /* bsafeSymmetric.cpp in Sources */,
-                               DCF784F71D88B62E00E694BB /* stack.c in Sources */,
-                               DCF7849C1D88B62D00E694BB /* bn_ctx.c in Sources */,
-                               DCF784F51D88B62E00E694BB /* rsa_sign.c in Sources */,
-                               DCF784F21D88B62E00E694BB /* rsa_null.c in Sources */,
-                               DCF784931D88B62D00E694BB /* bf_enc.c in Sources */,
-                               DCF784F41D88B62E00E694BB /* rsa_saos.c in Sources */,
-                               DCF783C51D88B60D00E694BB /* algmaker.cpp in Sources */,
-                               DCF7849D1D88B62D00E694BB /* bn_div.c in Sources */,
-                               DCF784C41D88B62E00E694BB /* dsa_ossl.c in Sources */,
+                               F667EC621E96EAD200203D5C /* main.m in Sources */,
+                               F667EC611E96E9E700203D5C /* authdtests.m in Sources */,

                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

-               DCF785601D88B95500E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DCF787221D88BA0100E694BB /* SSCSPSession.cpp in Sources */,
-                               DCF787261D88BA0100E694BB /* SSDLSession.cpp in Sources */,
-                               DCF7872A1D88BA0100E694BB /* SSKey.cpp in Sources */,
-                               DCF7871E1D88BA0100E694BB /* SSContext.cpp in Sources */,
-                               DCF787201D88BA0100E694BB /* SSCSPDLSession.cpp in Sources */,
-                               DCF7871C1D88BA0100E694BB /* CSPDLPlugin.cpp in Sources */,
-                               DCF787241D88BA0100E694BB /* SSDatabase.cpp in Sources */,
-                               DCF7871A1D88BA0100E694BB /* CSPDLDatabase.cpp in Sources */,
-                               DCF787281D88BA0100E694BB /* SSFactory.cpp in Sources */,
-                               DCF787301D88C18A00E694BB /* AppleCSPDLBuiltin.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+               0C10C93A1DD548B6000602A8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 0C10C9391DD548B6000602A8 /* PBXContainerItemProxy */;
+               };
+               0C10C93C1DD548BD000602A8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 0C10C93B1DD548BD000602A8 /* PBXContainerItemProxy */;
+               };
+               0C2B36C323C42EBC00000718 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C2B36C223C42EBC00000718 /* PBXContainerItemProxy */;
+               };
+               0C2B36C523C42EC800000718 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C2B36C423C42EC800000718 /* PBXContainerItemProxy */;
+               };
+               0C2BCBBC1D0640B200ED7A2F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C2BCBA81D06401F00ED7A2F /* dtlsEchoClient */;
+                       targetProxy = 0C2BCBBB1D0640B200ED7A2F /* PBXContainerItemProxy */;
+               };
+               0C2BCBD11D0648FA00ED7A2F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C2BCBBD1D0648D100ED7A2F /* dtlsEchoServer */;
+                       targetProxy = 0C2BCBD01D0648FA00ED7A2F /* PBXContainerItemProxy */;
+               };
+               0C65BB4D23C3F31B0063D2B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C65BB4C23C3F31B0063D2B7 /* PBXContainerItemProxy */;
+               };
+               0C65BB4F23C3F3270063D2B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C65BB4E23C3F3270063D2B7 /* PBXContainerItemProxy */;
+               };
+               0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = 0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */;
+               };
+               0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = 0C78CCE61FCC97F1008B4B24 /* PBXContainerItemProxy */;
+               };
+               0C7EB14D23F3D13C0089097B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = 0C7EB14C23F3D13C0089097B /* PBXContainerItemProxy */;
+               };
+               0C7EB14F23F3D1480089097B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 0C7EB14E23F3D1480089097B /* PBXContainerItemProxy */;
+               };
+               0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       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 */;
+               };
+               0CA378E923876E0900090B7E /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CA378E123876DD100090B7E /* reset_account */;
+                       targetProxy = 0CA378E823876E0900090B7E /* PBXContainerItemProxy */;
+               };
+               0CA378EB23876E1000090B7E /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CA378E123876DD100090B7E /* reset_account */;
+                       targetProxy = 0CA378EA23876E1000090B7E /* PBXContainerItemProxy */;
+               };
+               0CC593F82299EDFC006C34B5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = 0CC593F72299EDFC006C34B5 /* PBXContainerItemProxy */;
+               };
+               0CCC22AB23F38B0600E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 0CCC22AA23F38B0600E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CCC22AD23F38B0E00E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = 0CCC22AC23F38B0E00E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CCC22CE23F39A6300E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */;
+                       targetProxy = 0CCC22CD23F39A6300E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CCC22D023F39A6A00E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */;
+                       targetProxy = 0CCC22CF23F39A6A00E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CCC22D223F39A7500E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */;
+                       targetProxy = 0CCC22D123F39A7500E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CCC22D423F39A7C00E1FCD0 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */;
+                       targetProxy = 0CCC22D323F39A7C00E1FCD0 /* PBXContainerItemProxy */;
+               };
+               0CF09210219649DB002B0AEE /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
+                       targetProxy = 0CF0920F219649DB002B0AEE /* PBXContainerItemProxy */;
+               };
+               225394B61E30811400D3CD9B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 225394AC1E3080A600D3CD9B /* security_codesigning_ios */;
+                       targetProxy = 225394B51E30811400D3CD9B /* PBXContainerItemProxy */;
+               };
+               225394DA1E30846800D3CD9B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD067561D8CDCF3007602F1 /* codesigning_DTrace */;
+                       targetProxy = 225394D91E30846800D3CD9B /* PBXContainerItemProxy */;
+               };
+               226A8B451DEF58EE004C35E3 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD06AA91D8E0D53007602F1 /* security_utilities */;
+                       targetProxy = 226A8B441DEF58EE004C35E3 /* PBXContainerItemProxy */;
+               };
+               3DD1FF50201C09CD0086D049 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BC9C81D8B824700070CB0 /* security_ssl */;
+                       targetProxy = 3DD1FF4F201C09CD0086D049 /* PBXContainerItemProxy */;
+               };
+               3DD1FFAF201FDB1D0086D049 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BC9C81D8B824700070CB0 /* security_ssl */;
+                       targetProxy = 3DD1FFB0201FDB1D0086D049 /* PBXContainerItemProxy */;
+               };
+               3DD1FFB1201FDB1D0086D049 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 3DD1FFB2201FDB1D0086D049 /* PBXContainerItemProxy */;
+               };
+               3DD258A2204B7DA800F5DA78 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 3DD258A1204B7DA800F5DA78 /* PBXContainerItemProxy */;
+               };
+               3E4D531F2531185D00B124B3 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 3E4D49B32531170600B124B3 /* secsecstaticcodeapitest */;
+                       targetProxy = 3E4D531E2531185D00B124B3 /* PBXContainerItemProxy */;
+               };
+               3E88361D24F08F5400E9F4D6 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 3E88360824F068EF00E9F4D6 /* secseccodeapitest */;
+                       targetProxy = 3E88361C24F08F5400E9F4D6 /* PBXContainerItemProxy */;
+               };
+               438169E71B4EE4B300C54D58 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
+                       targetProxy = 438169E61B4EE4B300C54D58 /* PBXContainerItemProxy */;
+               };
+               4718AE03205B39620068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 4718AE04205B39620068EC3F /* PBXContainerItemProxy */;
+               };
+               4718AE05205B39620068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = 4718AE06205B39620068EC3F /* PBXContainerItemProxy */;
+               };
+               4718AE09205B39620068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 4718AE0A205B39620068EC3F /* PBXContainerItemProxy */;
+               };
+               4718AE0B205B39620068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = 4718AE0C205B39620068EC3F /* PBXContainerItemProxy */;
+               };
+               4718AE0D205B39620068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52EC3E1D80D00800B0A59C /* libSWCAgent */;
+                       targetProxy = 4718AE0E205B39620068EC3F /* PBXContainerItemProxy */;
+               };
+               4718AEE6205B3A350068EC3F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4718AE2E205B39C40068EC3F /* libsecurityd_bridge */;
+                       targetProxy = 4718AEE5205B3A350068EC3F /* PBXContainerItemProxy */;
+               };
+               47455B24205B3E2F008FE980 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4718AE02205B39620068EC3F /* securityd_bridge */;
+                       targetProxy = 47455B23205B3E2F008FE980 /* PBXContainerItemProxy */;
+               };
+               4771D982209A76B100BA9772 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
+                       targetProxy = 4771D981209A76B100BA9772 /* PBXContainerItemProxy */;
+               };
+               47A6FC6A206B461700BD6C54 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = 47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */;
+               };
+               47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
+                       targetProxy = 47C2F18B2059CBEA0062DE30 /* PBXContainerItemProxy */;
+               };
+               47C2F18E2059CBF40062DE30 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
+                       targetProxy = 47C2F18D2059CBF40062DE30 /* PBXContainerItemProxy */;
+               };
+               47C2F1902059CBFC0062DE30 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
+                       targetProxy = 47C2F18F2059CBFC0062DE30 /* PBXContainerItemProxy */;
+               };
+               47C2F1922059CC040062DE30 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
+                       targetProxy = 47C2F1912059CC040062DE30 /* PBXContainerItemProxy */;
+               };
+               47C51B8B1EEA657D0032D9E5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC1789031D77980500B50D50 /* Security_osx */;
+                       targetProxy = 47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */;
+               };
+               47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = 47DE88CD1FA7AD6200DD3254 /* 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 */;
+                       targetProxy = 4C52D0ED16EFCD720079966E /* PBXContainerItemProxy */;
+               };
+               4C541FA10F250C5200E508AE /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4C541F840F250BF500E508AE /* Security_executables_ios */;
+                       targetProxy = 4C541FA00F250C5200E508AE /* PBXContainerItemProxy */;
+               };
+               52D82BF616A627100078DFE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
+                       targetProxy = 52D82BF516A627100078DFE5 /* PBXContainerItemProxy */;
+               };
+               5346481B17331ED800FE9172 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
+                       targetProxy = 5346481A17331ED800FE9172 /* PBXContainerItemProxy */;
+               };
+               5AAE383623D261CF0025CF9E /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5A442F81233C330F00918373 /* experimentTool */;
+                       targetProxy = 5AAE383523D261CF0025CF9E /* PBXContainerItemProxy */;
+               };
+               6C14CA0423C4F6830097B572 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4718AE2E205B39C40068EC3F /* libsecurityd_bridge */;
+                       targetProxy = 6C14CA0323C4F6830097B572 /* PBXContainerItemProxy */;
+               };
+               6C16258123C4FFC40086A0FF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = 6C16258023C4FFC40086A0FF /* PBXContainerItemProxy */;
+               };
+               6C16258423C4FFD40086A0FF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = 6C16258323C4FFD40086A0FF /* PBXContainerItemProxy */;
+               };
+               6C16258623C4FFD40086A0FF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 6C16258523C4FFD40086A0FF /* PBXContainerItemProxy */;
+               };
+               6C2045F82424BC4400F9461D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C2045E92424BA7E00F9461D /* KeychainStasher */;
+                       targetProxy = 6C2045F72424BC4400F9461D /* PBXContainerItemProxy */;
+               };
+               6C2D797322C06CEB00C3CE32 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C39234421F13E4D00D018AD /* SecDbBackupTests */;
+                       targetProxy = 6C2D797222C06CEB00C3CE32 /* PBXContainerItemProxy */;
+               };
+               6C2D797522C06CEF00C3CE32 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6C2D797422C06CEF00C3CE32 /* PBXContainerItemProxy */;
+               };
+               6C4AA1AA2228B640006FA945 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = 6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */;
+               };
+               6C61D3E8242A29BA008AB9BB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C963280242A279B00C53CE2 /* stashtester */;
+                       targetProxy = 6C61D3E7242A29BA008AB9BB /* PBXContainerItemProxy */;
+               };
+               6C7BE2AA23C3DD64003BB2CA /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = 6C7BE2AB23C3DD64003BB2CA /* PBXContainerItemProxy */;
+               };
+               6C7BE2AC23C3DD64003BB2CA /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 6C7BE2AD23C3DD64003BB2CA /* PBXContainerItemProxy */;
+               };
+               6C7BE2EA23C3DD9C003BB2CA /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C7BE2A923C3DD64003BB2CA /* securitytool_bridge */;
+                       targetProxy = 6C7BE2E923C3DD9C003BB2CA /* PBXContainerItemProxy */;
+               };
+               6C9A49B21FAB647D00239D58 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */;
+               };
+               6CA9690D24ACC5C100C08B5E /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 6CA9690C24ACC5C100C08B5E /* PBXContainerItemProxy */;
+               };
+               6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = 6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */;
+               };
+               6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = 6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */;
+               };
+               6CC638E7226695B900E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 6CC638E6226695B900E5DB0B /* PBXContainerItemProxy */;
+               };
+               6CC638E9226695B900E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = 6CC638E8226695B900E5DB0B /* PBXContainerItemProxy */;
+               };
+               6CC638EB226695C300E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = 6CC638EA226695C300E5DB0B /* PBXContainerItemProxy */;
+               };
+               6CC638ED226695C300E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = 6CC638EC226695C300E5DB0B /* PBXContainerItemProxy */;

                };
                };

-               DCF787AE1D88C86900E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CC638FE2266AE0A00E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CC638FD2266AE0A00E5DB0B /* PBXContainerItemProxy */;

                };
                };

-               DCF788361D88C8C400E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DCF788441D88C8FF00E694BB /* AppleDLBuiltin.cpp in Sources */,
-                               DCF788411D88C8DE00E694BB /* AppleFileDL.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CC639002266AE0A00E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C39234421F13E4D00D018AD /* SecDbBackupTests */;
+                       targetProxy = 6CC638FF2266AE0A00E5DB0B /* PBXContainerItemProxy */;

                };
                };

-               DCF788491D88CA7200E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DCF788751D88CABC00E694BB /* AppleX509CL.cpp in Sources */,
-                               DCF788871D88CABC00E694BB /* clNssUtils.cpp in Sources */,
-                               DCF788921D88CABC00E694BB /* DecodedItem.cpp in Sources */,
-                               DCF788851D88CABC00E694BB /* clNameUtils.cpp in Sources */,
-                               DCF788951D88CABC00E694BB /* Session_Cert.cpp in Sources */,
-                               DCF788831D88CABC00E694BB /* CLFieldsCommon.cpp in Sources */,
-                               DCF7888C1D88CABC00E694BB /* DecodedCert.cpp in Sources */,
-                               DCF788771D88CABC00E694BB /* AppleX509CLBuiltin.cpp in Sources */,
-                               DCF7887B1D88CABC00E694BB /* CertFields.cpp in Sources */,
-                               DCF788791D88CABC00E694BB /* AppleX509CLSession.cpp in Sources */,
-                               DCF7888A1D88CABC00E694BB /* CSPAttacher.cpp in Sources */,
-                               DCF788801D88CABC00E694BB /* CLCrlExtensions.cpp in Sources */,
-                               DCF788781D88CABC00E694BB /* AppleX509CLPlugin.cpp in Sources */,
-                               DCF7887C1D88CABC00E694BB /* CLCachedEntry.cpp in Sources */,
-                               DCF7888E1D88CABC00E694BB /* DecodedCrl.cpp in Sources */,
-                               DCF788891D88CABC00E694BB /* CrlFields.cpp in Sources */,
-                               DCF788981D88CABC00E694BB /* Session_CSR.cpp in Sources */,
-                               DCF788961D88CABC00E694BB /* Session_CRL.cpp in Sources */,
-                               DCF788901D88CABC00E694BB /* DecodedExtensions.cpp in Sources */,
-                               DCF7887E1D88CABC00E694BB /* CLCertExtensions.cpp in Sources */,
-                               DCF788971D88CABC00E694BB /* Session_Crypto.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CE2AEAB22B2C1BE00C96AE7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */;
+                       targetProxy = 6CE2AEAA22B2C1BE00C96AE7 /* PBXContainerItemProxy */;

                };
                };

-               DCF788991D88CB5200E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DCF788A51D88CB6800E694BB /* AppleX509CLPlugin.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CE2AEAD22B2C1C300C96AE7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */;
+                       targetProxy = 6CE2AEAC22B2C1C300C96AE7 /* PBXContainerItemProxy */;

                };
                };

-               DCF788BC1D88CD2400E694BB /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DCF789341D88CD6700E694BB /* TPDatabase.cpp in Sources */,
-                               DCF7892B1D88CD6700E694BB /* TPCertInfo.cpp in Sources */,
-                               DCF789211D88CD6700E694BB /* AppleTP.cpp in Sources */,
-                               DCF789391D88CD6700E694BB /* ocspRequest.cpp in Sources */,
-                               DCF789371D88CD6700E694BB /* TPNetwork.cpp in Sources */,
-                               DCF789321D88CD6700E694BB /* tpCrlVerify.cpp in Sources */,
-                               DCF789231D88CD6700E694BB /* AppleTPSession.cpp in Sources */,
-                               DCF789281D88CD6700E694BB /* cuEnc64.c in Sources */,
-                               DCF789411D88CD6700E694BB /* tpPolicies.cpp in Sources */,
-                               DCF789481D88D17C00E694BB /* AppleX509TPBuiltin.cpp in Sources */,
-                               DCF7893F1D88CD6700E694BB /* tpOcspVerify.cpp in Sources */,
-                               DCF789301D88CD6700E694BB /* TPCrlInfo.cpp in Sources */,
-                               DCF789431D88CD6700E694BB /* tpTime.c in Sources */,
-                               DCF789261D88CD6700E694BB /* certGroupUtils.cpp in Sources */,
-                               DCF7893B1D88CD6700E694BB /* tpOcspCache.cpp in Sources */,
-                               DCF7892A1D88CD6700E694BB /* tpCertGroup.cpp in Sources */,
-                               DCF7893D1D88CD6700E694BB /* tpOcspCertVfy.cpp in Sources */,
-                               DCF7892F1D88CD6700E694BB /* tpCredRequest.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CF33CA62387156600D1E75D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CF33CA52387156600D1E75D /* PBXContainerItemProxy */;

                };
                };

-               E710C73E1331946400F85568 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               476541A31F33EDCC00413F65 /* SecdWatchdog.m in Sources */,
-                               4CC92B1C15A3BF2F00C6D578 /* testmain.c in Sources */,
-                               0C78F1CC16A5E1BF00654E08 /* sectask-10-sectask.c in Sources */,
-                               DCCD33D11E3FEF2C00AA4AD1 /* spi.c in Sources */,
-                               DCB221541E8B08BE001598BC /* server_xpc.m in Sources */,
-                               DC42690D1E82FD9B002B7110 /* server_security_helpers.c in Sources */,
-                               DC4268FC1E820370002B7110 /* server_endpoint.m in Sources */,
-                               DC5F35AB1EE0F27100900966 /* server_entitlement_helpers.c in Sources */,
-                               0C78F1CE16A5E1BF00654E08 /* sectask_ipc.defs in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               6CF33CA82387157200D1E75D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CF33CA72387157200D1E75D /* PBXContainerItemProxy */;

                };
                };

-               E7B01BC2166594AB000485F1 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               873C14B221540FED003C9C00 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 873C14B121540FED003C9C00 /* PBXContainerItemProxy */;

                };
                };

-               E7D847C01C6BE9710025BB44 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB413B801E663AEB00592085 /* PairingChannel.m in Sources */,
-                               E7F480151C73980D00390FDB /* KCJoiningRequestSession.m in Sources */,
-                               E7F480331C73FC4C00390FDB /* KCAESGCMDuplexSession.m in Sources */,
-                               E794BB001C7598F900339A0F /* KCJoiningMessages.m in Sources */,
-                               E794BA6F1C7424D800339A0F /* KCDer.m in Sources */,
-                               E7E3EFBA1CBC192A00E79A5D /* KCAccountKCCircleDelegate.m in Sources */,
-                               E7F482AC1C7558F700390FDB /* KCJoiningAcceptSession.m in Sources */,
-                               E71454F01C741E0800B5B20B /* KCError.m in Sources */,
-                               E772FD471CC15EFA00D63E41 /* NSData+SecRandom.m in Sources */,
-                               E7F482AA1C7554FB00390FDB /* NSError+KCCreationHelpers.m in Sources */,
-                               E75C0E831C6FC31D00E6953B /* KCSRPContext.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               87EDC39E2141BB8A007B0E64 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
+                       targetProxy = 87EDC39D2141BB8A007B0E64 /* PBXContainerItemProxy */;

                };
                };

-               E7D847CA1C6BE9720025BB44 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               E7F4809C1C74E85200390FDB /* KCDerTest.m in Sources */,
-                               E7F482701C74FDD100390FDB /* KCJoiningSessionTest.m in Sources */,
-                               E7D848051C6BEFCD0025BB44 /* KCSRPTests.m in Sources */,
-                               E7F4809E1C74E86D00390FDB /* KCAESGCMTest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               87EDC3A22141BB92007B0E64 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = 87EDC3A12141BB92007B0E64 /* PBXContainerItemProxy */;

                };
                };

-               EB056E3A1FE5E390000A771E /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               0CC3775020ACA0DF00B58D2D /* SFSignInAnalytics.m in Sources */,
-                               EBDD732C20A6A61E003A103A /* SOSAnalytics.m in Sources */,
-                               EB056E451FE5E390000A771E /* DeviceSimulatorMain.m in Sources */,
-                               EB056E431FE5E390000A771E /* DeviceSimulator.m in Sources */,
-                               EBCE16171FE6DE5A002E7CCC /* SecdWatchdog.m in Sources */,
-                               EBCE16181FE6DE5A002E7CCC /* SFSQLite.m in Sources */,
-                               EBCE16191FE6DE5A002E7CCC /* SFSQLiteStatement.m in Sources */,
-                               EBCE16201FE6DE5A002E7CCC /* SFAnalytics.m in Sources */,
-                               EBCE16221FE6DE5A002E7CCC /* SFAnalyticsActivityTracker.m in Sources */,
-                               EBCE16231FE6DE5A002E7CCC /* client_endpoint.m in Sources */,
-                               EBCE162C1FE6DE5A002E7CCC /* client.c in Sources */,
-                               EBCE162D1FE6DE5A002E7CCC /* SFAnalyticsSQLiteStore.m in Sources */,
-                               EBCE162F1FE6DE5A002E7CCC /* SecTask.c in Sources */,
-                               EBCE16311FE6DE5A002E7CCC /* SFAnalyticsMultiSampler.m in Sources */,
-                               DC5B391C20C08BF1005B09F6 /* SecFramework.c in Sources */,
-                               EBCE16321FE6DE5A002E7CCC /* SFAnalyticsSampler.m in Sources */,
-                               EBCE16351FE6DE5A002E7CCC /* server_xpc.m in Sources */,
-                               EBCE16361FE6DE5A002E7CCC /* server_security_helpers.c in Sources */,
-                               6C32BB9A20EAE6B80042DF59 /* LocalKeychainAnalytics.m in Sources */,
-                               EBCE16371FE6DE5A002E7CCC /* server_endpoint.m in Sources */,
-                               EBCE16391FE6DE5A002E7CCC /* spi.c in Sources */,
-                               EBCE163A1FE6DE5A002E7CCC /* SFObjCType.m in Sources */,
-                               EBCE163D1FE6DE5A002E7CCC /* server_entitlement_helpers.c in Sources */,
-                               EBCE163E1FE6DE5A002E7CCC /* AutoreleaseTest.c in Sources */,
-                               EBCE163F1FE6DE5A002E7CCC /* CKKSControl.m in Sources */,
-                               EBCE16401FE6DE5A002E7CCC /* CKKSControlProtocol.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               EB05C4ED1FE5E48A00D68712 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBCE166C1FE746A5002E7CCC /* SecItemConstants.c in Sources */,
-                               EB05C4F41FE5E48B00D68712 /* MultiDeviceSimulatorTests.m in Sources */,
-                               4885DCAD207FF0780071FB7B /* ClientInfoByNotification.m in Sources */,
-                               EBCE16601FE732AA002E7CCC /* MultiDeviceNetworking.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               87EDC3A42141BB9B007B0E64 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB27FF101E402CD300EC9E3A /* ckksctl */;
+                       targetProxy = 87EDC3A32141BB9B007B0E64 /* PBXContainerItemProxy */;

                };
                };

-               EB0BC9371C3C791500785842 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB0BC9671C3C798600785842 /* secedumodetest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               87EDC3A82141BBAA007B0E64 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
+                       targetProxy = 87EDC3A72141BBAA007B0E64 /* PBXContainerItemProxy */;

                };
                };

-               EB1055711E14DF430003C309 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB1055791E14DF570003C309 /* SecCertificateFuzzer.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               87EDC3B22141BBD5007B0E64 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
+                       targetProxy = 87EDC3B12141BBD5007B0E64 /* PBXContainerItemProxy */;

                };
                };

-               EB108F251E6CE4D2003B0456 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB108F261E6CE4D2003B0456 /* KCPairingTest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               ACBAF6FE1E941E090007BA2F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = ACBAF6991E9417F40007BA2F /* security_transform_regressions */;
+                       targetProxy = ACBAF6FD1E941E090007BA2F /* PBXContainerItemProxy */;

                };
                };

-               EB27FF0D1E402CD300EC9E3A /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC5BCC481E53820200649140 /* SecArgParse.c in Sources */,
-                               EB27FF2D1E407FF600EC9E3A /* ckksctl.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               BE061EB31EE5EAC800B22118 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
+                       targetProxy = BE061EB21EE5EAC800B22118 /* PBXContainerItemProxy */;

                };
                };

-               EB2D54A21F02A45E00E46890 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB2D54AB1F02A47200E46890 /* SecAtomicFile.cpp in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               BE197F631911742900BA91D1 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BE197F2519116FD100BA91D1 /* SharedWebCredentialViewService */;
+                       targetProxy = BE197F621911742900BA91D1 /* PBXContainerItemProxy */;

                };
                };

-               EB425C9F1C65846D000ECE53 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB425CCF1C658554000ECE53 /* secbackuptest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               BE4AC9B418B8020400B84964 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BE442BA018B7FDB800F24DAE /* swcagent */;
+                       targetProxy = BE4AC9B318B8020400B84964 /* PBXContainerItemProxy */;

                };
                };

-               EB433A211CC3243600A7EACE /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB433A291CC3244C00A7EACE /* secitemstresstest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
+                       targetProxy = BE9C38D21EB11605007E2AE1 /* PBXContainerItemProxy */;

                };
                };

-               EB49B2AA202D877F003F34A0 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */,
-                               0CC3771320A222BC00B58D2D /* SFSignInAnalytics.m in Sources */,
-                               EB49B2E5202DFEB3003F34A0 /* mockaks.m in Sources */,
-                               EB49B2DB202DF20F003F34A0 /* spi.c in Sources */,
-                               EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */,
-                               EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */,
-                               EBC73F2720993FC900AE3350 /* SFAnalyticsMultiSampler.m in Sources */,
-                               EB49B2D8202DF1F7003F34A0 /* server_xpc.m in Sources */,
-                               EBC73F2620993FA800AE3350 /* client_endpoint.m in Sources */,
-                               EB49B2D9202DF1F7003F34A0 /* server_security_helpers.c in Sources */,
-                               EBC73F2B2099785900AE3350 /* SFObjCType.m in Sources */,
-                               EB49B2E0202DF5D7003F34A0 /* server_entitlement_helpers.c in Sources */,
-                               EBC73F2A20996AD400AE3350 /* SFSQLiteStatement.m in Sources */,
-                               EB6667C7204CD69F000B404F /* testPlistDER.m in Sources */,
-                               EBC73F29209966AF00AE3350 /* SFSQLite.m in Sources */,
-                               EB49B2D5202DF1D8003F34A0 /* SecTask.c in Sources */,
-                               EB49B2D4202DF1C1003F34A0 /* client.c in Sources */,
-                               EB49B2D3202DF1AC003F34A0 /* SecdWatchdog.m in Sources */,
-                               EB49B2B1202D8780003F34A0 /* secdmockaks.m in Sources */,
-                               DC5B391B20C08BDC005B09F6 /* SecFramework.c in Sources */,
-                               EB49B2D1202DF15F003F34A0 /* SFAnalyticsActivityTracker.m in Sources */,
-                               EB49B2D0202DF14D003F34A0 /* SFAnalytics.m in Sources */,
-                               EBC73F2820993FDA00AE3350 /* SFAnalyticsSampler.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               BED01526206EEC710027A2B4 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = BED01525206EEC710027A2B4 /* PBXContainerItemProxy */;

                };
                };

-               EB9C1D761BDFD0E000F89272 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EB9C1D7E1BDFD0E100F89272 /* secbackupntest.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A7F1E2B5F3D00CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A7E1E2B5F3D00CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               EBA9AA7E1CE30E58004E2B68 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBA9AA871CE30E6F004E2B68 /* secitemnotifications.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A811E2B5F4700CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A801E2B5F4700CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               EBB839A11E29665D00853BAC /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBB839B01E2968AB00853BAC /* secfuzzer.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A861E2B5F7600CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A851E2B5F7600CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               EBCF73F41CE45F9C00BED7CA /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBCF73FD1CE45FAC00BED7CA /* secitemfunctionality.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A8C1E2B63D100CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A8B1E2B63D100CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               EBF3746E1DC055580065D840 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               EBF374751DC055590065D840 /* security-sysdiagnose.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A921E2B678D00CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A911E2B678D00CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               F621D02A1ED6DCE7000EA569 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               F619D71E1ED70BC1005B5F46 /* main.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D40B6A951E2B67FF00CD6EE5 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D40B6A941E2B67FF00CD6EE5 /* PBXContainerItemProxy */;

                };
                };

-               F667EC571E96E9B100203D5C /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               F667EC621E96EAD200203D5C /* main.m in Sources */,
-                               F667EC611E96E9E700203D5C /* authdtests.m in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
+               D41257E61E941ACC00781F23 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = D41257E51E941ACC00781F23 /* PBXContainerItemProxy */;

                };
                };

-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-               0C10C93A1DD548B6000602A8 /* PBXTargetDependency */ = {
+               D41257E81E941AD200781F23 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 0C10C9391DD548B6000602A8 /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D41257E71E941AD200781F23 /* PBXContainerItemProxy */;

                };
                };

-               0C10C93C1DD548BD000602A8 /* PBXTargetDependency */ = {
+               D41257F71E941E9600781F23 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
+                       targetProxy = D41257F61E941E9600781F23 /* PBXContainerItemProxy */;
+               };
+               D41AD4521B9788B2008C7270 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
+                       targetProxy = D41AD4511B9788B2008C7270 /* PBXContainerItemProxy */;
+               };
+               D42C83A5211636A3008D3D83 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D44D1F652115893000E76E1A /* CMS */;
+                       targetProxy = D42C83A4211636A3008D3D83 /* PBXContainerItemProxy */;
+               };
+               D437185421166DD800EA350A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D42C839721159146008D3D83 /* security_cms */;
+                       targetProxy = D437185321166DD800EA350A /* PBXContainerItemProxy */;
+               };
+               D437185921166FC800EA350A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D44D1F652115893000E76E1A /* CMS */;
+                       targetProxy = D437185821166FC800EA350A /* PBXContainerItemProxy */;
+               };
+               D437185B211670F600EA350A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4D1FDDB21165F8B003538E2 /* security_cms_regressions */;
+                       targetProxy = D437185A211670F600EA350A /* PBXContainerItemProxy */;
+               };
+               D437C33121EBF8A000DD1E06 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = D437C33021EBF8A000DD1E06 /* PBXContainerItemProxy */;
+               };
+               D453A4A52122236D00850A26 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D453A4A62122236D00850A26 /* PBXContainerItemProxy */;
+               };
+               D453A4C42122262400850A26 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;

-                       targetProxy = 0C10C93B1DD548BD000602A8 /* PBXContainerItemProxy */;
+                       targetProxy = D453A4C32122262400850A26 /* PBXContainerItemProxy */;

                };
                };

-               0C2BCBBC1D0640B200ED7A2F /* PBXTargetDependency */ = {
+               D453A4C8212226A900850A26 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C2BCBA81D06401F00ED7A2F /* dtlsEchoClient */;
-                       targetProxy = 0C2BCBBB1D0640B200ED7A2F /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = D453A4C7212226A900850A26 /* PBXContainerItemProxy */;

                };
                };

-               0C2BCBD11D0648FA00ED7A2F /* PBXTargetDependency */ = {
+               D456A06822AF1866001119F3 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C2BCBBD1D0648D100ED7A2F /* dtlsEchoServer */;
-                       targetProxy = 0C2BCBD01D0648FA00ED7A2F /* PBXContainerItemProxy */;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = D456A06722AF1866001119F3 /* PBXContainerItemProxy */;

                };
                };

-               0C3E2EA92073F5C400F5B95B /* PBXTargetDependency */ = {
+               D456A06B22AF1874001119F3 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
-                       targetProxy = 0C3E2EA82073F5C400F5B95B /* PBXContainerItemProxy */;
+                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
+                       targetProxy = D456A06A22AF1874001119F3 /* PBXContainerItemProxy */;

                };
                };

-               0C5663EE20BE2E1A0035F362 /* PBXTargetDependency */ = {
+               D456A06D22AF3238001119F3 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;

-                       targetProxy = 0C5663ED20BE2E1A0035F362 /* PBXContainerItemProxy */;
+                       targetProxy = D456A06C22AF3238001119F3 /* PBXContainerItemProxy */;

                };
                };

-               0C664AB41759270C0092D3D9 /* PBXTargetDependency */ = {
+               D45D8F4F2224D72C00D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
-                       targetProxy = 0C664AB31759270C0092D3D9 /* PBXContainerItemProxy */;
+                       target = DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */;
+                       targetProxy = D45D8F4E2224D72C00D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */ = {
+               D45D8F522224D76E00D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
-                       targetProxy = 0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */;
+                       target = DCE4E8DC1D7F39DB00AFB96E /* Cloud Keychain Utility */;
+                       targetProxy = D45D8F512224D76E00D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C78CCE71FCC97F1008B4B24 /* PBXTargetDependency */ = {
+               D45D8F542224D7C400D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
-                       targetProxy = 0C78CCE61FCC97F1008B4B24 /* PBXContainerItemProxy */;
+                       target = F621D0271ED6DCE7000EA569 /* authorizationdump */;
+                       targetProxy = D45D8F532224D7C400D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFD41FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F562224D87C00D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
-                       targetProxy = 0C85DFD51FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = DCD06A541D8CE2D5007602F1 /* gkunpack */;
+                       targetProxy = D45D8F552224D87C00D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F582224D88F00D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
-                       targetProxy = 0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = DC610AAD1D7910C3002223DE /* gk_reset_check_macos */;
+                       targetProxy = D45D8F572224D88F00D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFDA1FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F5A2224D8A100D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 0C85DFDB1FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
+                       targetProxy = D45D8F592224D8A100D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFDC1FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F5C2224D9F100D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 0C85DFDD1FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = D45D8F5B2224D9F100D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFDE1FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F5E2224DA1000D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 0C85DFDF1FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
+                       targetProxy = D45D8F5D2224DA1000D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C85DFE01FB38BB6000343A7 /* PBXTargetDependency */ = {
+               D45D8F602224DA6600D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 0C85DFE11FB38BB6000343A7 /* PBXContainerItemProxy */;
+                       target = 3DD1FFAC201FDB1D0086D049 /* SecureTransportTests_ios */;
+                       targetProxy = D45D8F5F2224DA6600D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F622224DA8400D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB108F181E6CE4D2003B0456 /* KCPairingTests */;
+                       targetProxy = D45D8F612224DA8400D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F642224DA8E00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = E7D847CD1C6BE9720025BB44 /* KeychainCircleTests */;
+                       targetProxy = D45D8F632224DA8E00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F662224DA9900D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D458C505214E20530043D982 /* TrustTests */;
+                       targetProxy = D45D8F652224DA9900D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F6A2224DA9900D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D4707A0421136E69005BCFDA /* TrustTests_ios */;
+                       targetProxy = D45D8F692224DA9900D6C124 /* PBXContainerItemProxy */;

                };
                };

-               0C99B740131C984900584CF4 /* PBXTargetDependency */ = {
+               D45D8F6C2224DABA00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC05037521409A4000A8EDB7 /* OCMockUmbrella */;
+                       targetProxy = D45D8F6B2224DABA00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F6E2224DB6400D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
+                       targetProxy = D45D8F6D2224DB6400D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F702224DB6D00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
+                       targetProxy = D45D8F6F2224DB6D00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F722224DB9200D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB9C1D791BDFD0E000F89272 /* secbackupntest */;
+                       targetProxy = D45D8F712224DB9200D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F742224DB9C00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
+                       targetProxy = D45D8F732224DB9C00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F782224DBB500D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
+                       targetProxy = D45D8F772224DBB500D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F7A2224DBBD00D6C124 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = 0C6799F912F7C37C00712919 /* dtlsTests */;
                        isa = PBXTargetDependency;
                        target = 0C6799F912F7C37C00712919 /* dtlsTests */;

-                       targetProxy = 0C99B73F131C984900584CF4 /* PBXContainerItemProxy */;
+                       targetProxy = D45D8F792224DBBD00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F7C2224DBC600D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = E710C7411331946400F85568 /* SecurityTests */;
+                       targetProxy = D45D8F7B2224DBC600D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F7E2224DBD900D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = D45D8F7D2224DBD900D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F822224DBE300D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = D45D8F812224DBE300D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F862224DBF800D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = D45D8F852224DBF800D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F882224DC3F00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
+                       targetProxy = D45D8F872224DC3F00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F8C2224DC7600D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = D45D8F8B2224DC7600D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F8E2224DC8E00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
+                       targetProxy = D45D8F8D2224DC8E00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F902224DC9900D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
+                       targetProxy = D45D8F8F2224DC9900D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F922224DCCB00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
+                       targetProxy = D45D8F912224DCCB00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F942224DCD700D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
+                       targetProxy = D45D8F932224DCD700D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F982224DD7B00D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
+                       targetProxy = D45D8F972224DD7B00D6C124 /* PBXContainerItemProxy */;
+               };
+               D45D8F9A2224DD8200D6C124 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
+                       targetProxy = D45D8F992224DD8200D6C124 /* PBXContainerItemProxy */;
+               };
+               D469C4E5218BECCE008AC1FC /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */;
+                       targetProxy = D469C4E4218BECCE008AC1FC /* PBXContainerItemProxy */;
+               };
+               D476BC3922BD34280098E15A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = D476BC3822BD34280098E15A /* PBXContainerItemProxy */;
+               };
+               D476BC3C22BD34320098E15A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
+                       targetProxy = D476BC3B22BD34320098E15A /* PBXContainerItemProxy */;
+               };
+               D477EE7121ED48A500C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB2D54A11F02A45E00E46890 /* secatomicfile */;
+                       targetProxy = D477EE7021ED48A500C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7321ED48AA00C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
+                       targetProxy = D477EE7221ED48AA00C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7521ED48B400C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = F667EC561E96E9B100203D5C /* authdtest */;
+                       targetProxy = D477EE7421ED48B400C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7721ED48C000C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
+                       targetProxy = D477EE7621ED48C000C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7921ED48C000C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
+                       targetProxy = D477EE7821ED48C000C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7B21ED48C000C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
+                       targetProxy = D477EE7A21ED48C000C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7D21ED48CB00C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EBB839A41E29665D00853BAC /* secfuzzer */;
+                       targetProxy = D477EE7C21ED48CB00C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE7F21ED48D500C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB1055741E14DF430003C309 /* SecCertificateFuzzer */;
+                       targetProxy = D477EE7E21ED48D500C9AAFF /* PBXContainerItemProxy */;
+               };
+               D477EE8121ED48DF00C9AAFF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
+                       targetProxy = D477EE8021ED48DF00C9AAFF /* PBXContainerItemProxy */;
+               };
+               D4794E6B21222E72007C6725 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       targetProxy = D4794E6A21222E72007C6725 /* PBXContainerItemProxy */;
+               };
+               D4A763CF2224BCD10063B2B9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCE4E7F51D7A4DA800AFB96E /* secd */;
+                       targetProxy = D4A763CE2224BCD10063B2B9 /* PBXContainerItemProxy */;
+               };
+               D4A763D12224BCDE0063B2B9 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCE4E82D1D7A57AE00AFB96E /* trustd_macos */;
+                       targetProxy = D4A763D02224BCDE0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               0C9AEEBA20783FE000BF6237 /* PBXTargetDependency */ = {
+               D4A763D32224BD640063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC1789031D77980500B50D50 /* Security_osx */;
-                       targetProxy = 0C9AEEB920783FE000BF6237 /* PBXContainerItemProxy */;
+                       target = DC610A551D78F9D2002223DE /* codesign_tests_macos */;
+                       targetProxy = D4A763D22224BD640063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               0CC827F2138712B100BD99B7 /* PBXTargetDependency */ = {
+               D4A763D52224BD6F0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = E710C7411331946400F85568 /* SecurityTests */;
-                       targetProxy = 0CC827F1138712B100BD99B7 /* PBXContainerItemProxy */;
+                       target = DC610A021D78F129002223DE /* secdtests_macos */;
+                       targetProxy = D4A763D42224BD6F0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               225394B61E30811400D3CD9B /* PBXTargetDependency */ = {
+               D4A763D92224BD990063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 225394AC1E3080A600D3CD9B /* security_codesigning_ios */;
-                       targetProxy = 225394B51E30811400D3CD9B /* PBXContainerItemProxy */;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = D4A763D82224BD990063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               225394DA1E30846800D3CD9B /* PBXTargetDependency */ = {
+               D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD067561D8CDCF3007602F1 /* codesigning_DTrace */;
-                       targetProxy = 225394D91E30846800D3CD9B /* PBXContainerItemProxy */;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = D4A763DE2224BDDC0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               226A8B451DEF58EE004C35E3 /* PBXTargetDependency */ = {
+               D4A763E12224BDED0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD06AA91D8E0D53007602F1 /* security_utilities */;
-                       targetProxy = 226A8B441DEF58EE004C35E3 /* PBXContainerItemProxy */;
+                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
+                       targetProxy = D4A763E02224BDED0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               3DD1FEF8201C07F30086D049 /* PBXTargetDependency */ = {
+               D4A763E32224BDF90063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 3DD1FEF9201C07F30086D049 /* PBXContainerItemProxy */;
+                       target = DC610A461D78F48F002223DE /* SecTaskTest_macos */;
+                       targetProxy = D4A763E22224BDF90063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               3DD1FF50201C09CD0086D049 /* PBXTargetDependency */ = {
+               D4A763E52224BE170063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BC9C81D8B824700070CB0 /* security_ssl */;
-                       targetProxy = 3DD1FF4F201C09CD0086D049 /* PBXContainerItemProxy */;
+                       target = DC5AC04F1D8352D900CF422C /* securityd_macos */;
+                       targetProxy = D4A763E42224BE170063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               3DD1FFAF201FDB1D0086D049 /* PBXTargetDependency */ = {
+               D4A763E72224BE2F0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BC9C81D8B824700070CB0 /* security_ssl */;
-                       targetProxy = 3DD1FFB0201FDB1D0086D049 /* PBXContainerItemProxy */;
+                       target = DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */;
+                       targetProxy = D4A763E62224BE2F0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               3DD1FFB1201FDB1D0086D049 /* PBXTargetDependency */ = {
+               D4A763E92224BE430063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 3DD1FFB2201FDB1D0086D049 /* PBXContainerItemProxy */;
+                       target = EB9C1D791BDFD0E000F89272 /* secbackupntest */;
+                       targetProxy = D4A763E82224BE430063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               438169E71B4EE4B300C54D58 /* PBXTargetDependency */ = {
+               D4A763EB2224BE580063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
-                       targetProxy = 438169E61B4EE4B300C54D58 /* PBXContainerItemProxy */;
+                       target = DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */;
+                       targetProxy = D4A763EA2224BE580063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AE03205B39620068EC3F /* PBXTargetDependency */ = {
+               D4A763ED2224BE630063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 4718AE04205B39620068EC3F /* PBXContainerItemProxy */;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = D4A763EC2224BE630063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AE05205B39620068EC3F /* PBXTargetDependency */ = {
+               D4A763EF2224BE6E0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = 4718AE06205B39620068EC3F /* PBXContainerItemProxy */;
+                       target = D458C505214E20530043D982 /* TrustTests */;
+                       targetProxy = D4A763EE2224BE6E0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AE09205B39620068EC3F /* PBXTargetDependency */ = {
+               D4A763F12224BE6E0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 4718AE0A205B39620068EC3F /* PBXContainerItemProxy */;
+                       target = D453A4A42122236D00850A26 /* TrustTests_macos */;
+                       targetProxy = D4A763F02224BE6E0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AE0B205B39620068EC3F /* PBXTargetDependency */ = {
+               D4A763F32224BE810063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 4718AE0C205B39620068EC3F /* PBXContainerItemProxy */;
+                       target = E7D847CD1C6BE9720025BB44 /* KeychainCircleTests */;
+                       targetProxy = D4A763F22224BE810063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AE0D205B39620068EC3F /* PBXTargetDependency */ = {
+               D4A763F52224BE8A0063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52EC3E1D80D00800B0A59C /* libSWCAgent */;
-                       targetProxy = 4718AE0E205B39620068EC3F /* PBXContainerItemProxy */;
+                       target = EB108F181E6CE4D2003B0456 /* KCPairingTests */;
+                       targetProxy = D4A763F42224BE8A0063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               4718AEE6205B3A350068EC3F /* PBXTargetDependency */ = {
+               D4A763F72224BE980063B2B9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4718AE2E205B39C40068EC3F /* libsecurityd_bridge */;
-                       targetProxy = 4718AEE5205B3A350068EC3F /* PBXContainerItemProxy */;
+                       target = 3DD1FEF5201C07F30086D049 /* SecureTransportTests_macos */;
+                       targetProxy = D4A763F62224BE980063B2B9 /* PBXContainerItemProxy */;

                };
                };

-               47455B24205B3E2F008FE980 /* PBXTargetDependency */ = {
+               D4B68C6A211B6E3E009FED69 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4718AE02205B39620068EC3F /* securityd_bridge */;
-                       targetProxy = 47455B23205B3E2F008FE980 /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D4B68C69211B6E3E009FED69 /* PBXContainerItemProxy */;

                };
                };

-               4771D982209A76B100BA9772 /* PBXTargetDependency */ = {
+               D4BFFD592227574200163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
-                       targetProxy = 4771D981209A76B100BA9772 /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = D4BFFD582227574200163B4B /* PBXContainerItemProxy */;

                };
                };

-               478D426D1FD72A8100CAB645 /* PBXTargetDependency */ = {
+               D4BFFD5C2227574C00163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = DC52EDA61D80D58400B0A59C /* secdRegressions */;
                        isa = PBXTargetDependency;
                        target = DC52EDA61D80D58400B0A59C /* secdRegressions */;

-                       targetProxy = 478D426E1FD72A8100CAB645 /* PBXContainerItemProxy */;
+                       targetProxy = D4BFFD5B2227574C00163B4B /* PBXContainerItemProxy */;

                };
                };

-               478D426F1FD72A8100CAB645 /* PBXTargetDependency */ = {
+               D4BFFD5E2227575C00163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
                        isa = PBXTargetDependency;
                        target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;

-                       targetProxy = 478D42701FD72A8100CAB645 /* PBXContainerItemProxy */;
+                       targetProxy = D4BFFD5D2227575C00163B4B /* PBXContainerItemProxy */;

                };
                };

-               478D42731FD72A8100CAB645 /* PBXTargetDependency */ = {
+               D4BFFD602227576E00163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;

-                       targetProxy = 478D42741FD72A8100CAB645 /* PBXContainerItemProxy */;
+                       targetProxy = D4BFFD5F2227576E00163B4B /* PBXContainerItemProxy */;

                };
                };

-               47A6FC6A206B461700BD6C54 /* PBXTargetDependency */ = {
+               D4BFFD622227578900163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = 47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = D4BFFD612227578900163B4B /* PBXContainerItemProxy */;

                };
                };

-               47A6FC6C206B462400BD6C54 /* PBXTargetDependency */ = {
+               D4BFFD6722275A4B00163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = 47A6FC6B206B462400BD6C54 /* PBXContainerItemProxy */;
+                       target = DC05037521409A4000A8EDB7 /* OCMockUmbrella */;
+                       targetProxy = D4BFFD6622275A4B00163B4B /* PBXContainerItemProxy */;

                };
                };

-               47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */ = {
+               D4BFFD692227B30700163B4B /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
-                       targetProxy = 47C2F18B2059CBEA0062DE30 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = D4BFFD682227B30700163B4B /* PBXContainerItemProxy */;

                };
                };

-               47C2F18E2059CBF40062DE30 /* PBXTargetDependency */ = {
+               D4E0E9512224DDE300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
-                       targetProxy = 47C2F18D2059CBF40062DE30 /* PBXContainerItemProxy */;
+                       target = DC05037521409A4000A8EDB7 /* OCMockUmbrella */;
+                       targetProxy = D4E0E9502224DDE300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47C2F1902059CBFC0062DE30 /* PBXTargetDependency */ = {
+               D4E0E9542224DDEA00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
-                       targetProxy = 47C2F18F2059CBFC0062DE30 /* PBXContainerItemProxy */;
+                       target = EB108F181E6CE4D2003B0456 /* KCPairingTests */;
+                       targetProxy = D4E0E9532224DDEA00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47C2F1922059CC040062DE30 /* PBXTargetDependency */ = {
+               D4E0E9562224DDF000A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47C2F1822059CB680062DE30 /* KeychainResources */;
-                       targetProxy = 47C2F1912059CC040062DE30 /* PBXContainerItemProxy */;
+                       target = E7D847CD1C6BE9720025BB44 /* KeychainCircleTests */;
+                       targetProxy = D4E0E9552224DDF000A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47C51B8B1EEA657D0032D9E5 /* PBXTargetDependency */ = {
+               D4E0E9582224DDFE00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC1789031D77980500B50D50 /* Security_osx */;
-                       targetProxy = 47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */;
+                       target = D458C505214E20530043D982 /* TrustTests */;
+                       targetProxy = D4E0E9572224DDFE00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47D991D020407F7E0078CAE2 /* PBXTargetDependency */ = {
+               D4E0E95A2224DDFE00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = 47D991CF20407F7E0078CAE2 /* PBXContainerItemProxy */;
+                       target = D4707A0421136E69005BCFDA /* TrustTests_ios */;
+                       targetProxy = D4E0E9592224DDFE00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47D991D720407F890078CAE2 /* PBXTargetDependency */ = {
+               D4E0E95C2224DE1000A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 478D426C1FD72A8100CAB645 /* secdxctests_mac */;
-                       targetProxy = 47D991D620407F890078CAE2 /* PBXContainerItemProxy */;
+                       target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
+                       targetProxy = D4E0E95B2224DE1000A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */ = {
+               D4E0E95E2224DE1A00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */;
+                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
+                       targetProxy = D4E0E95D2224DE1A00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47DE88D71FA7ADAC00DD3254 /* PBXTargetDependency */ = {
+               D4E0E9602224DE2700A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
-                       targetProxy = 47DE88D61FA7ADAC00DD3254 /* PBXContainerItemProxy */;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = D4E0E95F2224DE2700A802E0 /* PBXContainerItemProxy */;

                };
                };

-               47DE88D91FA7ADBB00DD3254 /* PBXTargetDependency */ = {
+               D4E0E9622224DE3D00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52EDA61D80D58400B0A59C /* secdRegressions */;
-                       targetProxy = 47DE88D81FA7ADBB00DD3254 /* PBXContainerItemProxy */;
+                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
+                       targetProxy = D4E0E9612224DE3D00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4809F7AE2061B6AA003E72D0 /* PBXTargetDependency */ = {
+               D4E0E9642224DE4900A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB056E3D1FE5E390000A771E /* DeviceSimulator */;
-                       targetProxy = 4809F7AD2061B6AA003E72D0 /* PBXContainerItemProxy */;
+                       target = E710C7411331946400F85568 /* SecurityTests */;
+                       targetProxy = D4E0E9632224DE4900A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4809F7B02061B6B0003E72D0 /* PBXTargetDependency */ = {
+               D4E0E9662224DE5100A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB05C4F01FE5E48A00D68712 /* MultiDeviceSimulatorTests */;
-                       targetProxy = 4809F7AF2061B6B0003E72D0 /* PBXContainerItemProxy */;
+                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
+                       targetProxy = D4E0E9652224DE5100A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C52D0EE16EFCD720079966E /* PBXTargetDependency */ = {
+               D4E0E9682224DE5700A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C52D0B316EFC61E0079966E /* CircleJoinRequested */;
-                       targetProxy = 4C52D0ED16EFCD720079966E /* PBXContainerItemProxy */;
+                       target = 0C6799F912F7C37C00712919 /* dtlsTests */;
+                       targetProxy = D4E0E9672224DE5700A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C541F8C0F250C0400E508AE /* PBXTargetDependency */ = {
+               D4E0E96A2224DE6800A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
-                       targetProxy = 4C541F8B0F250C0400E508AE /* PBXContainerItemProxy */;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = D4E0E9692224DE6800A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C541F8E0F250C0900E508AE /* PBXTargetDependency */ = {
+               D4E0E96C2224DE7000A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
-                       targetProxy = 4C541F8D0F250C0900E508AE /* PBXContainerItemProxy */;
+                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
+                       targetProxy = D4E0E96B2224DE7000A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C541F900F250C0E00E508AE /* PBXTargetDependency */ = {
+               D4E0E96E2224DE7A00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
-                       targetProxy = 4C541F8F0F250C0E00E508AE /* PBXContainerItemProxy */;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = D4E0E96D2224DE7A00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C541F920F250C1300E508AE /* PBXTargetDependency */ = {
+               D4E0E9702224DE8200A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
-                       targetProxy = 4C541F910F250C1300E508AE /* PBXContainerItemProxy */;
+                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
+                       targetProxy = D4E0E96F2224DE8200A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C541FA10F250C5200E508AE /* PBXTargetDependency */ = {
+               D4E0E9722224DE8200A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C541F840F250BF500E508AE /* Security_executables_ios */;
-                       targetProxy = 4C541FA00F250C5200E508AE /* PBXContainerItemProxy */;
+                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
+                       targetProxy = D4E0E9712224DE8200A802E0 /* PBXContainerItemProxy */;

                };
                };

-               4C9DE9EF1181ACA000CF5C27 /* PBXTargetDependency */ = {
+               D4E0E9742224DE8200A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
-                       targetProxy = 4C9DE9EE1181ACA000CF5C27 /* PBXContainerItemProxy */;
+                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
+                       targetProxy = D4E0E9732224DE8200A802E0 /* PBXContainerItemProxy */;

                };
                };

-               52D82BF616A627100078DFE5 /* PBXTargetDependency */ = {
+               D4E0E97C2224DF0300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
-                       targetProxy = 52D82BF516A627100078DFE5 /* PBXContainerItemProxy */;
+                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
+                       targetProxy = D4E0E97B2224DF0300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               5346481B17331ED800FE9172 /* PBXTargetDependency */ = {
+               D4E0E97E2224DF0B00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
-                       targetProxy = 5346481A17331ED800FE9172 /* PBXContainerItemProxy */;
+                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
+                       targetProxy = D4E0E97D2224DF0B00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               5E10995419A5E80B00A60E2B /* PBXTargetDependency */ = {
+               D4E0E9802224DF0B00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5E10992419A5E55800A60E2B /* ISACLProtectedItems */;
-                       targetProxy = 5E10995319A5E80B00A60E2B /* PBXContainerItemProxy */;
+                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
+                       targetProxy = D4E0E97F2224DF0B00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               5EF7C2561B00EEF900E5E99C /* PBXTargetDependency */ = {
+               D4E0E9822224DF0B00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
-                       targetProxy = 5EF7C2551B00EEF900E5E99C /* PBXContainerItemProxy */;
+                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
+                       targetProxy = D4E0E9812224DF0B00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C24EF4A1E415109000DE79F /* PBXTargetDependency */ = {
+               D4E0E9862224DF4E00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
-                       targetProxy = 6C24EF491E415109000DE79F /* PBXContainerItemProxy */;
+                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
+                       targetProxy = D4E0E9852224DF4E00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C24EF531E415132000DE79F /* PBXTargetDependency */ = {
+               D4E0E9882224DF5800A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
-                       targetProxy = 6C24EF521E415132000DE79F /* PBXContainerItemProxy */;
+                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
+                       targetProxy = D4E0E9872224DF5800A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C7C38811FD88C4700DFFE68 /* PBXTargetDependency */ = {
+               D4E0E98A2224DF6F00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
-                       targetProxy = 6C7C38801FD88C4700DFFE68 /* PBXContainerItemProxy */;
+                       target = DC05037521409A4000A8EDB7 /* OCMockUmbrella */;
+                       targetProxy = D4E0E9892224DF6F00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C7C38881FD88C5A00DFFE68 /* PBXTargetDependency */ = {
+               D4E0E98C2224DF7700A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
-                       targetProxy = 6C7C38871FD88C5A00DFFE68 /* PBXContainerItemProxy */;
+                       target = EB108F181E6CE4D2003B0456 /* KCPairingTests */;
+                       targetProxy = D4E0E98B2224DF7700A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C98082F1E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E98E2224DF7D00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
-                       targetProxy = 6C9808301E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = E7D847CD1C6BE9720025BB44 /* KeychainCircleTests */;
+                       targetProxy = D4E0E98D2224DF7D00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808311E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E9902224DF8500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 6C9808321E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = D458C505214E20530043D982 /* TrustTests */;
+                       targetProxy = D4E0E98F2224DF8500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808351E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E9922224DF8500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 6C9808361E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = D4707A0421136E69005BCFDA /* TrustTests_ios */;
+                       targetProxy = D4E0E9912224DF8500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808371E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E9942224DF8D00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 6C9808381E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = D4E0E9932224DF8D00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808391E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E9962224DF9300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 6C98083A1E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
+                       targetProxy = D4E0E9952224DF9300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C98083B1E788AEB00E70590 /* PBXTargetDependency */ = {
+               D4E0E9982224DF9A00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
-                       targetProxy = 6C98083C1E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = D4E0E9972224DF9A00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C98086B1E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E99A2224DFAD00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
-                       targetProxy = 6C98086C1E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = E710C7411331946400F85568 /* SecurityTests */;
+                       targetProxy = D4E0E9992224DFAD00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C98086D1E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E99C2224DFB500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 6C98086E1E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
+                       targetProxy = D4E0E99B2224DFB500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808711E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E99E2224DFBA00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 6C9808721E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 0C6799F912F7C37C00712919 /* dtlsTests */;
+                       targetProxy = D4E0E99D2224DFBA00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808731E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E9A02224DFC500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 6C9808741E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
+                       targetProxy = D4E0E99F2224DFC500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808751E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E9A22224DFCB00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 6C9808761E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = D4E0E9A12224DFCB00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808771E788AFD00E70590 /* PBXTargetDependency */ = {
+               D4E0E9A42224DFD500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
-                       targetProxy = 6C9808781E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
+                       targetProxy = D4E0E9A32224DFD500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808A01E788B9400E70590 /* PBXTargetDependency */ = {
+               D4E0E9A62224DFDD00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */;
-                       targetProxy = 6C98089F1E788B9400E70590 /* PBXContainerItemProxy */;
+                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
+                       targetProxy = D4E0E9A52224DFDD00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9808A41E788CB100E70590 /* PBXTargetDependency */ = {
+               D4E0E9A82224DFDD00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */;
-                       targetProxy = 6C9808A31E788CB100E70590 /* PBXContainerItemProxy */;
+                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
+                       targetProxy = D4E0E9A72224DFDD00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6C9A49B21FAB647D00239D58 /* PBXTargetDependency */ = {
+               D4E0E9AA2224DFDD00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */;
+                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
+                       targetProxy = D4E0E9A92224DFDD00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6CAA8CE51F82FD08007B6E03 /* PBXTargetDependency */ = {
+               D4E0E9AE2224E00600A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
-                       targetProxy = 6CAA8CE41F82FD08007B6E03 /* PBXContainerItemProxy */;
+                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
+                       targetProxy = D4E0E9AD2224E00600A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6CAA8CE91F82FD13007B6E03 /* PBXTargetDependency */ = {
+               D4E0E9B02224E00F00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C9AA79D1F7C1D8F00D08296 /* supdctl */;
-                       targetProxy = 6CAA8CE81F82FD13007B6E03 /* PBXContainerItemProxy */;
+                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
+                       targetProxy = D4E0E9AF2224E00F00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */ = {
+               D4E0E9B22224E00F00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
-                       targetProxy = 6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */;
+                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
+                       targetProxy = D4E0E9B12224E00F00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               6CAA8D3F1F8431C9007B6E03 /* PBXTargetDependency */ = {
+               D4E0E9B42224E00F00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
-                       targetProxy = 6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */;
+                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
+                       targetProxy = D4E0E9B32224E00F00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               ACBAF6FE1E941E090007BA2F /* PBXTargetDependency */ = {
+               D4E0E9BC2224E15500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = ACBAF6991E9417F40007BA2F /* security_transform_regressions */;
-                       targetProxy = ACBAF6FD1E941E090007BA2F /* PBXContainerItemProxy */;
+                       target = E060D19B2124780E0025B833 /* OctagonTestHarness */;
+                       targetProxy = D4E0E9BB2224E15500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE061EAC1EE5EA5600B22118 /* PBXTargetDependency */ = {
+               D4E0E9BE2224E15E00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
-                       targetProxy = BE061EAB1EE5EA5600B22118 /* PBXContainerItemProxy */;
+                       target = E060D19B2124780E0025B833 /* OctagonTestHarness */;
+                       targetProxy = D4E0E9BD2224E15E00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE061EB31EE5EAC800B22118 /* PBXTargetDependency */ = {
+               D4E0E9C02224E16A00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
-                       targetProxy = BE061EB21EE5EAC800B22118 /* PBXContainerItemProxy */;
+                       target = E060D19B2124780E0025B833 /* OctagonTestHarness */;
+                       targetProxy = D4E0E9BF2224E16A00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE061EB71EE5EB9000B22118 /* PBXTargetDependency */ = {
+               D4E0E9C22224E17300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
-                       targetProxy = BE061EB61EE5EB9000B22118 /* PBXContainerItemProxy */;
+                       target = E060D19B2124780E0025B833 /* OctagonTestHarness */;
+                       targetProxy = D4E0E9C12224E17300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE061EB91EE5EBA000B22118 /* PBXTargetDependency */ = {
+               D4E0E9C52224E71600A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BED208D41EDF950E00753952 /* manifeststresstest */;
-                       targetProxy = BE061EB81EE5EBA000B22118 /* PBXContainerItemProxy */;
+                       target = DC52EC3E1D80D00800B0A59C /* libSWCAgent */;
+                       targetProxy = D4E0E9C42224E71600A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE197F631911742900BA91D1 /* PBXTargetDependency */ = {
+               D4E0E9C72224E76100A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BE197F2519116FD100BA91D1 /* SharedWebCredentialViewService */;
-                       targetProxy = BE197F621911742900BA91D1 /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = D4E0E9C62224E76100A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE4AC9B418B8020400B84964 /* PBXTargetDependency */ = {
+               D4E0E9CB2224FB5700A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BE442BA018B7FDB800F24DAE /* swcagent */;
-                       targetProxy = BE4AC9B318B8020400B84964 /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = D4E0E9CA2224FB5700A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE9C38C81EB115A7007E2AE1 /* PBXTargetDependency */ = {
+               D4E0E9CF2224FD7A00A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
-                       targetProxy = BE9C38C71EB115A7007E2AE1 /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = D4E0E9CE2224FD7A00A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE9C38CF1EB115C9007E2AE1 /* PBXTargetDependency */ = {
+               D4E0E9D12224FE3300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
-                       targetProxy = BE9C38CE1EB115C9007E2AE1 /* PBXContainerItemProxy */;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = D4E0E9D02224FE3300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE9C38D11EB115F4007E2AE1 /* PBXTargetDependency */ = {
+               D4E0E9D32224FE3300A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
-                       targetProxy = BE9C38D01EB115F4007E2AE1 /* PBXContainerItemProxy */;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = D4E0E9D22224FE3300A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */ = {
+               D4E0E9D52224FE4100A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
-                       targetProxy = BE9C38D21EB11605007E2AE1 /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = D4E0E9D42224FE4100A802E0 /* PBXContainerItemProxy */;

                };
                };

-               BEF88C331EAFFC3F00357577 /* PBXTargetDependency */ = {
+               D4E0E9D72225023600A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
-                       targetProxy = BEF88C321EAFFC3F00357577 /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = D4E0E9D62225023600A802E0 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A7F1E2B5F3D00CD6EE5 /* PBXTargetDependency */ = {
+               D4E0E9DB2225D14500A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A7E1E2B5F3D00CD6EE5 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = D4E0E9DA2225D14500A802E0 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A811E2B5F4700CD6EE5 /* PBXTargetDependency */ = {
+               D4E0E9DD2225D1E600A802E0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A801E2B5F4700CD6EE5 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = D4E0E9DC2225D1E600A802E0 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A861E2B5F7600CD6EE5 /* PBXTargetDependency */ = {
+               D4EB53B9223C3CE3009101F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A851E2B5F7600CD6EE5 /* PBXContainerItemProxy */;
+                       target = D458C505214E20530043D982 /* TrustTests */;
+                       targetProxy = D4EB53B8223C3CE3009101F8 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A8C1E2B63D100CD6EE5 /* PBXTargetDependency */ = {
+               D4EB53BB223C3CE3009101F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A8B1E2B63D100CD6EE5 /* PBXContainerItemProxy */;
+                       target = D4707A0421136E69005BCFDA /* TrustTests_ios */;
+                       targetProxy = D4EB53BA223C3CE3009101F8 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A921E2B678D00CD6EE5 /* PBXTargetDependency */ = {
+               D4EB53BE223C3D2B009101F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A911E2B678D00CD6EE5 /* PBXContainerItemProxy */;
+                       target = DAE40BC520CF3E46002D5674 /* secitemcanarytest */;
+                       targetProxy = D4EB53BD223C3D2B009101F8 /* PBXContainerItemProxy */;

                };
                };

-               D40B6A951E2B67FF00CD6EE5 /* PBXTargetDependency */ = {
+               D4EB53C9223C4AB5009101F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D40B6A941E2B67FF00CD6EE5 /* PBXContainerItemProxy */;
+                       target = 5E10992419A5E55800A60E2B /* ISACLProtectedItems */;
+                       targetProxy = D4EB53C8223C4AB5009101F8 /* PBXContainerItemProxy */;

                };
                };

-               D41257E61E941ACC00781F23 /* PBXTargetDependency */ = {
+               D4EB53CB223C4ABE009101F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = D41257E51E941ACC00781F23 /* PBXContainerItemProxy */;
+                       target = 5E10992419A5E55800A60E2B /* ISACLProtectedItems */;
+                       targetProxy = D4EB53CA223C4ABE009101F8 /* PBXContainerItemProxy */;

                };
                };

-               D41257E81E941AD200781F23 /* PBXTargetDependency */ = {
+               D4F47B2D22270B23003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
-                       targetProxy = D41257E71E941AD200781F23 /* PBXContainerItemProxy */;
+                       target = D4F56B86217FA32000FCA6B7 /* Security_executables_core_ios */;
+                       targetProxy = D4F47B2C22270B23003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41257F11E941E7D00781F23 /* PBXTargetDependency */ = {
+               D4F47B3122270B38003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
-                       targetProxy = D41257F01E941E7D00781F23 /* PBXContainerItemProxy */;
+                       target = D4F56BC621813ECF00FCA6B7 /* Security_internal_ios */;
+                       targetProxy = D4F47B3022270B38003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41257F31E941E8600781F23 /* PBXTargetDependency */ = {
+               D4F47B3322270B4E003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
-                       targetProxy = D41257F21E941E8600781F23 /* PBXContainerItemProxy */;
+                       target = D4D1D40821ADC9720012C66C /* Security_executables_core_osx */;
+                       targetProxy = D4F47B3222270B4E003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41257F51E941E8E00781F23 /* PBXTargetDependency */ = {
+               D4F47B3722270B5D003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
-                       targetProxy = D41257F41E941E8E00781F23 /* PBXContainerItemProxy */;
+                       target = D4F56BC221813EC900FCA6B7 /* Security_internal_osx */;
+                       targetProxy = D4F47B3622270B5D003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41257F71E941E9600781F23 /* PBXTargetDependency */ = {
+               D4F47B4522270BB6003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = D41257CE1E9410A300781F23 /* trustd_ios */;
-                       targetProxy = D41257F61E941E9600781F23 /* PBXContainerItemProxy */;
+                       target = D4F56B91217FA40800FCA6B7 /* Security_frameworks_watchos */;
+                       targetProxy = D4F47B4422270BB6003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D419C0261E57EACA008619D1 /* PBXTargetDependency */ = {
+               D4F47B4722270BB6003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
-                       targetProxy = D419C0251E57EACA008619D1 /* PBXContainerItemProxy */;
+                       target = D4D1D3FC21AD0B3F0012C66C /* Security_executables_core_watchos */;
+                       targetProxy = D4F47B4622270BB6003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD43A1B96721E008C7270 /* PBXTargetDependency */ = {
+               D4F47B4922270BB6003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
-                       targetProxy = D41AD4391B96721E008C7270 /* PBXContainerItemProxy */;
+                       target = D41AD42D1B967169008C7270 /* Security_executables_watchos */;
+                       targetProxy = D4F47B4822270BB6003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD43C1B96723B008C7270 /* PBXTargetDependency */ = {
+               D4F47B4B22270BB6003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = E710C7411331946400F85568 /* SecurityTests */;
-                       targetProxy = D41AD43B1B96723B008C7270 /* PBXContainerItemProxy */;
+                       target = D4F56BCE21813EE800FCA6B7 /* Security_internal_watchos */;
+                       targetProxy = D4F47B4A22270BB6003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD43E1B967242008C7270 /* PBXTargetDependency */ = {
+               D4F47B4D22270BB6003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
-                       targetProxy = D41AD43D1B967242008C7270 /* PBXContainerItemProxy */;
+                       target = D477EE6421ED479500C9AAFF /* Security_tests_watchos */;
+                       targetProxy = D4F47B4C22270BB6003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4401B96724C008C7270 /* PBXTargetDependency */ = {
+               D4F47B4F22270BC0003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C6799F912F7C37C00712919 /* dtlsTests */;
-                       targetProxy = D41AD43F1B96724C008C7270 /* PBXContainerItemProxy */;
+                       target = BEAA0040202B728B00E51F45 /* Security_executables_Swift */;
+                       targetProxy = D4F47B4E22270BC0003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4421B97866C008C7270 /* PBXTargetDependency */ = {
+               D4F47B5122270BD9003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
-                       targetProxy = D41AD4411B97866C008C7270 /* PBXContainerItemProxy */;
+                       target = D4F56B8D217FA3F800FCA6B7 /* Security_frameworks_tvos */;
+                       targetProxy = D4F47B5022270BD9003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4441B978681008C7270 /* PBXTargetDependency */ = {
+               D4F47B5322270BD9003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
-                       targetProxy = D41AD4431B978681008C7270 /* PBXContainerItemProxy */;
+                       target = D4D1D40121AD0B4B0012C66C /* Security_executables_core_tvos */;
+                       targetProxy = D4F47B5222270BD9003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4461B9786A3008C7270 /* PBXTargetDependency */ = {
+               D4F47B5522270BD9003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
-                       targetProxy = D41AD4451B9786A3008C7270 /* PBXContainerItemProxy */;
+                       target = D41AD4311B967179008C7270 /* Security_executables_tvos */;
+                       targetProxy = D4F47B5422270BD9003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD44A1B9786D8008C7270 /* PBXTargetDependency */ = {
+               D4F47B5722270BD9003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */;
-                       targetProxy = D41AD4491B9786D8008C7270 /* PBXContainerItemProxy */;
+                       target = D4F56BCA21813EDC00FCA6B7 /* Security_internal_tvos */;
+                       targetProxy = D4F47B5622270BD9003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD44C1B9786E2008C7270 /* PBXTargetDependency */ = {
+               D4F47B5922270BD9003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
-                       targetProxy = D41AD44B1B9786E2008C7270 /* PBXContainerItemProxy */;
+                       target = D477EE6021ED477B00C9AAFF /* Security_tests_tvos */;
+                       targetProxy = D4F47B5822270BD9003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD44E1B978791008C7270 /* PBXTargetDependency */ = {
+               D4F47B5B22270BDE003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5E10992419A5E55800A60E2B /* ISACLProtectedItems */;
-                       targetProxy = D41AD44D1B978791008C7270 /* PBXContainerItemProxy */;
+                       target = BEAA0040202B728B00E51F45 /* Security_executables_Swift */;
+                       targetProxy = D4F47B5A22270BDE003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4521B9788B2008C7270 /* PBXTargetDependency */ = {
+               D4F47B5D22270BEB003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
-                       targetProxy = D41AD4511B9788B2008C7270 /* PBXContainerItemProxy */;
+                       target = DC6D1C70208A547400AB21AF /* Security_frameworks_bridge */;
+                       targetProxy = D4F47B5C22270BEB003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD45C1B978A7A008C7270 /* PBXTargetDependency */ = {
+               D4F47B5F22270BEB003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 790851B50CA9859F0083CC4D /* securityd_ios */;
-                       targetProxy = D41AD45B1B978A7A008C7270 /* PBXContainerItemProxy */;
+                       target = EB6A6FAE1B90F8810045DC68 /* Security_executables_bridge */;
+                       targetProxy = D4F47B5E22270BEB003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD45E1B978A7C008C7270 /* PBXTargetDependency */ = {
+               D4F47B6122270BEB003483E9 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
-                       targetProxy = D41AD45D1B978A7C008C7270 /* PBXContainerItemProxy */;
+                       target = D477EE5C21ED476D00C9AAFF /* Security_tests_bridge */;
+                       targetProxy = D4F47B6022270BEB003483E9 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4601B978E18008C7270 /* PBXTargetDependency */ = {
+               D4F56B9D217FCA7E00FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = E710C7411331946400F85568 /* SecurityTests */;
-                       targetProxy = D41AD45F1B978E18008C7270 /* PBXContainerItemProxy */;
+                       target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
+                       targetProxy = D4F56B9C217FCA7E00FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4621B978E24008C7270 /* PBXTargetDependency */ = {
+               D4F56B9F217FCA8600FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C0BDB2E175685B000BC1A7E /* secdtests_ios */;
-                       targetProxy = D41AD4611B978E24008C7270 /* PBXContainerItemProxy */;
+                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
+                       targetProxy = D4F56B9E217FCA8600FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4661B978F19008C7270 /* PBXTargetDependency */ = {
+               D4F56BA5217FCAAA00FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C6799F912F7C37C00712919 /* dtlsTests */;
-                       targetProxy = D41AD4651B978F19008C7270 /* PBXContainerItemProxy */;
+                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
+                       targetProxy = D4F56BA4217FCAAA00FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD4681B978F20008C7270 /* PBXTargetDependency */ = {
+               D4F56BA7217FCAB000FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 7913B1FF0D172B3900601FE9 /* sslServer */;
-                       targetProxy = D41AD4671B978F20008C7270 /* PBXContainerItemProxy */;
+                       target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
+                       targetProxy = D4F56BA6217FCAB000FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD46A1B978F24008C7270 /* PBXTargetDependency */ = {
+               D4F56BAB217FCAF600FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
-                       targetProxy = D41AD4691B978F24008C7270 /* PBXContainerItemProxy */;
+                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
+                       targetProxy = D4F56BAA217FCAF600FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD46C1B978F28008C7270 /* PBXTargetDependency */ = {
+               D4F56BB32181306900FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C9DE9D11181AC4800CF5C27 /* sslEcdsa */;
-                       targetProxy = D41AD46B1B978F28008C7270 /* PBXContainerItemProxy */;
+                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
+                       targetProxy = D4F56BB22181306900FCA6B7 /* PBXContainerItemProxy */;

                };
                };

-               D41AD46E1B978F4C008C7270 /* PBXTargetDependency */ = {
+               D4F56BB72181380600FCA6B7 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
-                       targetProxy = D41AD46D1B978F4C008C7270 /* PBXContainerItemProxy */;
+                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
+                       targetProxy = D4F56BB62181380600FCA6B7 /* PBXContainerItemProxy */;
+               };
+               D4F56BBB2181387600FCA6B7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
+                       targetProxy = D4F56BBA2181387600FCA6B7 /* PBXContainerItemProxy */;

                };
                DA30D6821DF8C93500EC6B43 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */;
                        targetProxy = DA30D6811DF8C93500EC6B43 /* PBXContainerItemProxy */;
                };
                };
                DA30D6821DF8C93500EC6B43 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DA30D6751DF8C8FB00EC6B43 /* KeychainSyncAccountUpdater */;
                        targetProxy = DA30D6811DF8C93500EC6B43 /* PBXContainerItemProxy */;
                };

-               DAE40BD520CF3ED5002D5674 /* PBXTargetDependency */ = {
+               DA41FE1D2241B64800838FB3 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DAE40BC520CF3E46002D5674 /* secitemcanarytest */;
-                       targetProxy = DAE40BD420CF3ED5002D5674 /* PBXContainerItemProxy */;
+                       target = DA41FE0D2241ADC000838FB3 /* otpaird */;
+                       targetProxy = DA41FE1C2241B64800838FB3 /* PBXContainerItemProxy */;
+               };
+               DA41FE1F2241B65A00838FB3 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DA41FE0D2241ADC000838FB3 /* otpaird */;
+                       targetProxy = DA41FE1E2241B65A00838FB3 /* PBXContainerItemProxy */;

                };
                DC0067901D878132005AF8DB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC0067901D878132005AF8DB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -32338,21 +38611,6 @@
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
                        targetProxy = DC00AB911D821D6000513D74 /* PBXContainerItemProxy */;
                };
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
                        targetProxy = DC00AB911D821D6000513D74 /* PBXContainerItemProxy */;
                };

-               DC00AB941D821D6500513D74 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52EBC61D80CEF100B0A59C /* SecurityCommands */;
-                       targetProxy = DC00AB931D821D6500513D74 /* PBXContainerItemProxy */;
-               };
-               DC00AB961D821D6800513D74 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52EA441D80CB7000B0A59C /* SecurityTool */;
-                       targetProxy = DC00AB951D821D6800513D74 /* PBXContainerItemProxy */;
-               };
-               DC00AB9E1D821DBB00513D74 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = DC00AB9D1D821DBB00513D74 /* PBXContainerItemProxy */;
-               };

                DC00ABAA1D821DE600513D74 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                DC00ABAA1D821DE600513D74 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;


@@ -32443,6 +38701,36 @@
                        target = DC52EC601D80D0C400B0A59C /* SOSRegressions */;
                        targetProxy = DC00ABEF1D821FBA00513D74 /* PBXContainerItemProxy */;
                };
                        target = DC52EC601D80D0C400B0A59C /* SOSRegressions */;
                        targetProxy = DC00ABEF1D821FBA00513D74 /* PBXContainerItemProxy */;
                };

+               DC00C91620B3B73900628BEB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = DC00C91520B3B73900628BEB /* PBXContainerItemProxy */;
+               };
+               DC00C91820B3B74600628BEB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = DC00C91720B3B74600628BEB /* PBXContainerItemProxy */;
+               };
+               DC00C91A20B3B74E00628BEB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = DC00C91920B3B74E00628BEB /* PBXContainerItemProxy */;
+               };
+               DC00C91F20B3B7A800628BEB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = DC00C91E20B3B7A800628BEB /* PBXContainerItemProxy */;
+               };
+               DC00C92720B3B86800628BEB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       targetProxy = DC00C92620B3B86800628BEB /* PBXContainerItemProxy */;
+               };
+               DC0503612140848100A8EDB7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BED987D22099145300607A5F /* TrustedPeersHelperUnitTests */;
+                       targetProxy = DC0503602140848100A8EDB7 /* PBXContainerItemProxy */;
+               };

                DC0984F71E1DB6D400140ADC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                DC0984F71E1DB6D400140ADC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;


@@ -32563,49 +38851,29 @@
                        target = DC0BCCF41D8C694700070CB0 /* utilitiesRegressions */;
                        targetProxy = DC0BCDBA1D8C6AF000070CB0 /* PBXContainerItemProxy */;
                };
                        target = DC0BCCF41D8C694700070CB0 /* utilitiesRegressions */;
                        targetProxy = DC0BCDBA1D8C6AF000070CB0 /* PBXContainerItemProxy */;
                };

-               DC1789791D779C6700B50D50 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = libsecurity_smime;
-                       targetProxy = DC1789781D779C6700B50D50 /* PBXContainerItemProxy */;
-               };

                DC178BF31D77ABE300B50D50 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC1789031D77980500B50D50 /* Security_osx */;
                        targetProxy = DC178BF21D77ABE300B50D50 /* PBXContainerItemProxy */;
                };
                DC178BF31D77ABE300B50D50 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC1789031D77980500B50D50 /* Security_osx */;
                        targetProxy = DC178BF21D77ABE300B50D50 /* PBXContainerItemProxy */;
                };

-               DC193C6020CB4C9D009C1A0F /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = libsecurity_cms_regressions;
-                       targetProxy = DC193C5F20CB4C9D009C1A0F /* PBXContainerItemProxy */;
-               };
-               DC222C791E034EE700B09171 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC222C371E034D1F00B09171 /* libsecurityd_ios_NO_AKS */;
-                       targetProxy = DC222C781E034EE700B09171 /* PBXContainerItemProxy */;
-               };

                DC2671101F3E933700816EED /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                DC2671101F3E933700816EED /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC26710F1F3E933700816EED /* PBXContainerItemProxy */;
                };
                        targetProxy = DC26710F1F3E933700816EED /* PBXContainerItemProxy */;
                };

-               DC34CD2D20326C2C00302481 /* PBXTargetDependency */ = {
+               DC27C3CD20EAFDF800F7839C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */;
-               };
-               DC34CD3420326C3100302481 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = DC34CD3320326C3100302481 /* PBXContainerItemProxy */;
+                       target = DC99B85B20EACA470065B73B /* OctagonTests */;
+                       targetProxy = DC27C3CC20EAFDF800F7839C /* PBXContainerItemProxy */;

                };
                };

-               DC34CD3620326C3B00302481 /* PBXTargetDependency */ = {
+               DC311E672124A9D2002F5EAE /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = DC34CD3520326C3B00302481 /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DC311E662124A9D2002F5EAE /* PBXContainerItemProxy */;

                };
                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */;
                };
                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */ = {
                        targetProxy = DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */;
                };
                DC3502CE1E020E2200BC0587 /* PBXTargetDependency */ = {


@@ -32618,35 +38886,40 @@
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = DC3502D41E02117600BC0587 /* PBXContainerItemProxy */;
                };
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = DC3502D41E02117600BC0587 /* PBXContainerItemProxy */;
                };

+               DC391FA321C03F8D00772585 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 0C8BBEFD1FCB446400580909 /* otctl */;
+                       targetProxy = DC391FA221C03F8D00772585 /* PBXContainerItemProxy */;
+               };

                DC3A4B6B1D91EBEE00E46D4A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC3A4B571D91E9FB00E46D4A /* CodeSigningHelper */;
                        targetProxy = DC3A4B6A1D91EBEE00E46D4A /* PBXContainerItemProxy */;
                };
                DC3A4B6B1D91EBEE00E46D4A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC3A4B571D91E9FB00E46D4A /* CodeSigningHelper */;
                        targetProxy = DC3A4B6A1D91EBEE00E46D4A /* PBXContainerItemProxy */;
                };

-               DC5224F91E4029520021640A /* PBXTargetDependency */ = {
+               DC3E18CA212501C200073D80 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
-                       targetProxy = DC5224F81E4029520021640A /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DC3E18C9212501C200073D80 /* PBXContainerItemProxy */;

                };
                };

-               DC5225001E40295C0021640A /* PBXTargetDependency */ = {
+               DC3E18CC2125020400073D80 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
-                       targetProxy = DC5224FF1E40295C0021640A /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DC3E18CB2125020400073D80 /* PBXContainerItemProxy */;

                };
                };

-               DC52E84B1D80BF1100B0A59C /* PBXTargetDependency */ = {
+               DC3E18CE2125024C00073D80 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = DC52E84A1D80BF1100B0A59C /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DC3E18CD2125024C00073D80 /* PBXContainerItemProxy */;

                };
                };

-               DC52EAA51D80CCF600B0A59C /* PBXTargetDependency */ = {
+               DC3E18E82125F9EF00073D80 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52EA441D80CB7000B0A59C /* SecurityTool */;
-                       targetProxy = DC52EAA41D80CCF600B0A59C /* PBXContainerItemProxy */;
+                       target = DC36895D21235F42003A3735 /* aks_mock */;
+                       targetProxy = DC3E18E72125F9EF00073D80 /* PBXContainerItemProxy */;

                };
                };

-               DC52EC201D80CF7400B0A59C /* PBXTargetDependency */ = {
+               DC52E84B1D80BF1100B0A59C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC52EBC61D80CEF100B0A59C /* SecurityCommands */;
-                       targetProxy = DC52EC1F1D80CF7400B0A59C /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DC52E84A1D80BF1100B0A59C /* PBXContainerItemProxy */;

                };
                DC52EC3D1D80CFF000B0A59C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC52EC3D1D80CFF000B0A59C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -32698,26 +38971,11 @@
                        target = DC52EE661D80D82600B0A59C /* SecItemShimOSX */;
                        targetProxy = DC52EE7D1D80D8B100B0A59C /* PBXContainerItemProxy */;
                };
                        target = DC52EE661D80D82600B0A59C /* SecItemShimOSX */;
                        targetProxy = DC52EE7D1D80D8B100B0A59C /* PBXContainerItemProxy */;
                };

-               DC58C42A1D77BE03003C25A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC1789031D77980500B50D50 /* Security_osx */;
-                       targetProxy = DC58C4291D77BE03003C25A4 /* PBXContainerItemProxy */;
-               };

                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC58C4221D77BDEA003C25A4 /* csparser_osx */;
                        targetProxy = DC58C4421D77C1F8003C25A4 /* PBXContainerItemProxy */;
                };
                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC58C4221D77BDEA003C25A4 /* csparser_osx */;
                        targetProxy = DC58C4421D77C1F8003C25A4 /* PBXContainerItemProxy */;
                };

-               DC59E9A61D91C710001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = libCMSInstall;
-                       targetProxy = DC59E9A51D91C710001BDDF5 /* PBXContainerItemProxy */;
-               };
-               DC59E9A91D91C7CC001BDDF5 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       name = libCMS;
-                       targetProxy = DC59E9A81D91C7CC001BDDF5 /* PBXContainerItemProxy */;
-               };

                DC5ABE1C1D832F5E00CF422C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC5ABDC41D832DAB00CF422C /* securitytool_macos */;
                DC5ABE1C1D832F5E00CF422C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC5ABDC41D832DAB00CF422C /* securitytool_macos */;


@@ -32733,45 +38991,20 @@
                        name = securityd_service;
                        targetProxy = DC5AC0BE1D83534300CF422C /* PBXContainerItemProxy */;
                };
                        name = securityd_service;
                        targetProxy = DC5AC0BE1D83534300CF422C /* PBXContainerItemProxy */;
                };

-               DC5AC12F1D8356DA00CF422C /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC5AC04F1D8352D900CF422C /* securityd_macos */;
-                       targetProxy = DC5AC12E1D8356DA00CF422C /* PBXContainerItemProxy */;
-               };
-               DC61096B1D78E60C002223DE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
-                       targetProxy = DC61096A1D78E60C002223DE /* PBXContainerItemProxy */;
-               };
-               DC61096D1D78E72C002223DE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB9C1D791BDFD0E000F89272 /* secbackupntest */;
-                       targetProxy = DC61096C1D78E72C002223DE /* PBXContainerItemProxy */;
-               };
-               DC610A381D78F15C002223DE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC610A021D78F129002223DE /* secdtests_macos */;
-                       targetProxy = DC610A371D78F15C002223DE /* PBXContainerItemProxy */;
-               };
-               DC610A421D78F3A5002223DE /* PBXTargetDependency */ = {
+               DC6013372147222B00863C1A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */;
-                       targetProxy = DC610A411D78F3A5002223DE /* PBXContainerItemProxy */;
-               };
-               DC610A541D78F759002223DE /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC610A461D78F48F002223DE /* SecTaskTest_macos */;
-                       targetProxy = DC610A531D78F759002223DE /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DC6013362147222B00863C1A /* PBXContainerItemProxy */;

                };
                };

-               DC610A6C1D78FAA2002223DE /* PBXTargetDependency */ = {
+               DC60133D214722C900863C1A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC610A551D78F9D2002223DE /* codesign_tests_macos */;
-                       targetProxy = DC610A6B1D78FAA2002223DE /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DC60133C214722C900863C1A /* PBXContainerItemProxy */;

                };
                };

-               DC610ABC1D791139002223DE /* PBXTargetDependency */ = {
+               DC6063B021B0755D00069B82 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DC610AAD1D7910C3002223DE /* gk_reset_check_macos */;
-                       targetProxy = DC610ABB1D791139002223DE /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DC6063AF21B0755D00069B82 /* PBXContainerItemProxy */;

                };
                DC63CAF31D90DF6000C03317 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC63CAF31D90DF6000C03317 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -32788,10 +39021,25 @@
                        target = DC63CAE81D90D63500C03317 /* libsecurityd_macos_mig */;
                        targetProxy = DC63CAF61D90DF7000C03317 /* PBXContainerItemProxy */;
                };
                        target = DC63CAE81D90D63500C03317 /* libsecurityd_macos_mig */;
                        targetProxy = DC63CAF61D90DF7000C03317 /* PBXContainerItemProxy */;
                };

-               DC63CAFA1D91A16700C03317 /* PBXTargetDependency */ = {
+               DC647C44208A85BE00D0F9F8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
+                       targetProxy = DC647C43208A85BE00D0F9F8 /* PBXContainerItemProxy */;
+               };
+               DC647C46208A85C900D0F9F8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
+                       targetProxy = DC647C45208A85C900D0F9F8 /* PBXContainerItemProxy */;
+               };
+               DC647C48208A864800D0F9F8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEAA0040202B728B00E51F45 /* Security_executables_Swift */;
+                       targetProxy = DC647C47208A864800D0F9F8 /* PBXContainerItemProxy */;
+               };
+               DC647C4A208A865200D0F9F8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       name = libsecurity_cms_regressions;
-                       targetProxy = DC63CAF91D91A16700C03317 /* PBXContainerItemProxy */;
+                       target = BEAA0040202B728B00E51F45 /* Security_executables_Swift */;
+                       targetProxy = DC647C49208A865200D0F9F8 /* PBXContainerItemProxy */;

                };
                DC65E7221D8CB27900152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC65E7221D8CB27900152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -32840,12 +39088,12 @@
                };
                DC65E7421D8CB3D400152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC65E7421D8CB3D400152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC65E7411D8CB3D400152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7441D8CB3E000152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        targetProxy = DC65E7411D8CB3D400152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7441D8CB3E000152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC65E7431D8CB3E000152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7461D8CB3E700152EF0 /* PBXTargetDependency */ = {
                        targetProxy = DC65E7431D8CB3E000152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7461D8CB3E700152EF0 /* PBXTargetDependency */ = {


@@ -32870,7 +39118,7 @@
                };
                DC65E74E1D8CB41E00152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC65E74E1D8CB41E00152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC65E74D1D8CB41E00152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7501D8CB42700152EF0 /* PBXTargetDependency */ = {
                        targetProxy = DC65E74D1D8CB41E00152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7501D8CB42700152EF0 /* PBXTargetDependency */ = {


@@ -32900,7 +39148,7 @@
                };
                DC65E75A1D8CB48900152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC65E75A1D8CB48900152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC65E7591D8CB48900152EF0 /* PBXContainerItemProxy */;
                };
                DC65E75C1D8CB49200152EF0 /* PBXTargetDependency */ = {
                        targetProxy = DC65E7591D8CB48900152EF0 /* PBXContainerItemProxy */;
                };
                DC65E75C1D8CB49200152EF0 /* PBXTargetDependency */ = {


@@ -32915,7 +39163,7 @@
                };
                DC65E7601D8CB4A300152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC65E7601D8CB4A300152EF0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC65E75F1D8CB4A300152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7621D8CB4AA00152EF0 /* PBXTargetDependency */ = {
                        targetProxy = DC65E75F1D8CB4A300152EF0 /* PBXContainerItemProxy */;
                };
                DC65E7621D8CB4AA00152EF0 /* PBXTargetDependency */ = {


@@ -32968,6 +39216,11 @@
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = DC65E7731D8CB4FB00152EF0 /* PBXContainerItemProxy */;
                };
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = DC65E7731D8CB4FB00152EF0 /* PBXContainerItemProxy */;
                };

+               DC69A5832165295F00512BD6 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DC69A5822165295F00512BD6 /* PBXContainerItemProxy */;
+               };

                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */;
                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */;


@@ -32983,6 +39236,11 @@
                        target = DC6BC27C1D90D1EE00DD57B3 /* security_cssm_generator */;
                        targetProxy = DC6BC2811D90D30F00DD57B3 /* PBXContainerItemProxy */;
                };
                        target = DC6BC27C1D90D1EE00DD57B3 /* security_cssm_generator */;
                        targetProxy = DC6BC2811D90D30F00DD57B3 /* PBXContainerItemProxy */;
                };

+               DC6D1C73208A547400AB21AF /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
+                       targetProxy = DC6D1C74208A547400AB21AF /* PBXContainerItemProxy */;
+               };

                DC71D8E41D959C000065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                DC71D8E41D959C000065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;


@@ -32993,29 +39251,19 @@
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = DC71D8EA1D959C130065FB93 /* PBXContainerItemProxy */;
                };
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = DC71D8EA1D959C130065FB93 /* PBXContainerItemProxy */;
                };

-               DC71D9E11D95BAC40065FB93 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC71D99F1D95BA6C0065FB93 /* ASN1 */;
-                       targetProxy = DC71D9E01D95BAC40065FB93 /* PBXContainerItemProxy */;
-               };
-               DC71D9E31D95BAD50065FB93 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC71D99F1D95BA6C0065FB93 /* ASN1 */;
-                       targetProxy = DC71D9E21D95BAD50065FB93 /* PBXContainerItemProxy */;
-               };

                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                DC71DA031D95BDEA0065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC71DA021D95BDEA0065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA051D95BDF90065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        targetProxy = DC71DA021D95BDEA0065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA051D95BDF90065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC71DA041D95BDF90065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA071D95BE2F0065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        targetProxy = DC71DA041D95BDF90065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA071D95BE2F0065FB93 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC71DA061D95BE2F0065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA0D1D95DD670065FB93 /* PBXTargetDependency */ = {
                        targetProxy = DC71DA061D95BE2F0065FB93 /* PBXContainerItemProxy */;
                };
                DC71DA0D1D95DD670065FB93 /* PBXTargetDependency */ = {


@@ -33023,6 +39271,16 @@
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
                        targetProxy = DC71DA0C1D95DD670065FB93 /* PBXContainerItemProxy */;
                };
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
                        targetProxy = DC71DA0C1D95DD670065FB93 /* PBXContainerItemProxy */;
                };

+               DC7FC45221EE9208003C39B8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC7FC44721EE914C003C39B8 /* FeatureFlagsPlist */;
+                       targetProxy = DC7FC45121EE9208003C39B8 /* PBXContainerItemProxy */;
+               };
+               DC7FC45421EE921A003C39B8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC7FC44721EE914C003C39B8 /* FeatureFlagsPlist */;
+                       targetProxy = DC7FC45321EE921A003C39B8 /* PBXContainerItemProxy */;
+               };

                DC82FFEB1D90D4640085674B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC82FFE51D90D3F60085674B /* security_utilities_DTrace */;
                DC82FFEB1D90D4640085674B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC82FFE51D90D3F60085674B /* security_utilities_DTrace */;


@@ -33035,9 +39293,29 @@
                };
                DC89998B1E410DBF00E6E604 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DC89998B1E410DBF00E6E604 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */;
                };
                        targetProxy = DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */;
                };

+               DC99B85C20EACA470065B73B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       targetProxy = DC99B85D20EACA470065B73B /* PBXContainerItemProxy */;
+               };
+               DC99B86220EACA470065B73B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = DC99B86320EACA470065B73B /* PBXContainerItemProxy */;
+               };
+               DC99B86420EACA470065B73B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = DC99B86520EACA470065B73B /* PBXContainerItemProxy */;
+               };
+               DCA232FC209A35840007B57D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEAA002A202A832500E51F45 /* TrustedPeersHelper */;
+                       targetProxy = DCA232FB209A35840007B57D /* PBXContainerItemProxy */;
+               };

                DCB332471F47857D00178C30 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
                DCB332471F47857D00178C30 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;


@@ -33045,7 +39323,7 @@
                };
                DCB340191D8A248C0054D16E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DCB340191D8A248C0054D16E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DCB340181D8A248C0054D16E /* PBXContainerItemProxy */;
                };
                DCB3408A1D8A25230054D16E /* PBXTargetDependency */ = {
                        targetProxy = DCB340181D8A248C0054D16E /* PBXContainerItemProxy */;
                };
                DCB3408A1D8A25230054D16E /* PBXTargetDependency */ = {


@@ -33078,40 +39356,85 @@
                        target = DCB343AD1D8A34FD0054D16E /* security_keychain_regressions */;
                        targetProxy = DCB345B21D8A361F0054D16E /* PBXContainerItemProxy */;
                };
                        target = DCB343AD1D8A34FD0054D16E /* security_keychain_regressions */;
                        targetProxy = DCB345B21D8A361F0054D16E /* PBXContainerItemProxy */;
                };

-               DCB515D01ED3CC36001F1152 /* PBXTargetDependency */ = {
+               DCBF4A8B21FFC82100539F0A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCBF4A8C21FFC82100539F0A /* PBXContainerItemProxy */;
+               };
+               DCBF4A8D21FFC82100539F0A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C9808681E788AFD00E70590 /* CKKSCloudKitTests_ios */;
-                       targetProxy = DCB515CF1ED3CC36001F1152 /* PBXContainerItemProxy */;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DCBF4A8E21FFC82100539F0A /* PBXContainerItemProxy */;

                };
                };

-               DCB515D71ED3CC52001F1152 /* PBXTargetDependency */ = {
+               DCBF4A8F21FFC82100539F0A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */;
-                       targetProxy = DCB515D61ED3CC52001F1152 /* PBXContainerItemProxy */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       targetProxy = DCBF4A9021FFC82100539F0A /* PBXContainerItemProxy */;

                };
                };

-               DCB515D91ED3CC6B001F1152 /* PBXTargetDependency */ = {
+               DCBF4A9121FFC82100539F0A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */;
-                       targetProxy = DCB515D81ED3CC6B001F1152 /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = DCBF4A9221FFC82100539F0A /* PBXContainerItemProxy */;

                };
                };

-               DCB515DB1ED3CC73001F1152 /* PBXTargetDependency */ = {
+               DCBF4A9321FFC82100539F0A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */;
-                       targetProxy = DCB515DA1ED3CC73001F1152 /* PBXContainerItemProxy */;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = DCBF4A9421FFC82100539F0A /* PBXContainerItemProxy */;

                };
                };

-               DCBE6E4A1D91E23D00A3E5E5 /* PBXTargetDependency */ = {
+               DCBF4A9521FFC82100539F0A /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCD06A541D8CE2D5007602F1 /* gkunpack */;
-                       targetProxy = DCBE6E491D91E23D00A3E5E5 /* PBXContainerItemProxy */;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = DCBF4A9621FFC82100539F0A /* PBXContainerItemProxy */;
+               };
+               DCBF4A9721FFC82100539F0A /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = DCBF4A9821FFC82100539F0A /* PBXContainerItemProxy */;

                };
                DCC093781D80ABC300F984E4 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = DCC093771D80ABC300F984E4 /* PBXContainerItemProxy */;
                };
                };
                DCC093781D80ABC300F984E4 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = DCC093771D80ABC300F984E4 /* PBXContainerItemProxy */;
                };

-               DCC5BF381D937329008D1E84 /* PBXTargetDependency */ = {
+               DCC5D6682087EDB300BBC127 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       name = libsecurity_cms;
-                       targetProxy = DCC5BF371D937329008D1E84 /* PBXContainerItemProxy */;
+                       target = DC0EF8EE208697C600AB9E95 /* tpctl */;
+                       targetProxy = DCC5D6672087EDB300BBC127 /* PBXContainerItemProxy */;
+               };
+               DCC5D66A2087EEE200BBC127 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = BEAA0040202B728B00E51F45 /* Security_executables_Swift */;
+                       targetProxy = DCC5D6692087EEE200BBC127 /* PBXContainerItemProxy */;
+               };
+               DCC7A67B216435A40034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCC78EA81D8088E200865A7C /* security */;
+                       targetProxy = DCC7A67A216435A40034967D /* PBXContainerItemProxy */;
+               };
+               DCC7A67F216435B30034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
+                       targetProxy = DCC7A67E216435B30034967D /* PBXContainerItemProxy */;
+               };
+               DCC7A682216446D30034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
+                       targetProxy = DCC7A681216446D30034967D /* PBXContainerItemProxy */;
+               };
+               DCC7A684216446D90034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
+                       targetProxy = DCC7A683216446D90034967D /* PBXContainerItemProxy */;
+               };
+               DCC7A686216446E50034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
+                       targetProxy = DCC7A685216446E50034967D /* PBXContainerItemProxy */;
+               };
+               DCC7A688216446EB0034967D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = DCC7A687216446EB0034967D /* PBXContainerItemProxy */;

                };
                DCD067831D8CDF58007602F1 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DCD067831D8CDF58007602F1 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -33195,7 +39518,7 @@
                };
                DCD22D7D1D8CCA18001C9B81 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                DCD22D7D1D8CCA18001C9B81 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = DCD22D7C1D8CCA18001C9B81 /* PBXContainerItemProxy */;
                };
                DCD22D7F1D8CCA2C001C9B81 /* PBXTargetDependency */ = {
                        targetProxy = DCD22D7C1D8CCA18001C9B81 /* PBXContainerItemProxy */;
                };
                DCD22D7F1D8CCA2C001C9B81 /* PBXTargetDependency */ = {


@@ -33223,6 +39546,21 @@
                        target = DCD66DC41D8205C400DB1393 /* SecOtrOSX */;
                        targetProxy = DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */;
                };
                        target = DCD66DC41D8205C400DB1393 /* SecOtrOSX */;
                        targetProxy = DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */;
                };

+               DCD6BF5821E919820015F7A8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCD6BF5721E919820015F7A8 /* PBXContainerItemProxy */;
+               };
+               DCD6BF5A21E919A60015F7A8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCD6BF5921E919A60015F7A8 /* PBXContainerItemProxy */;
+               };
+               DCD6BF5E21E919E10015F7A8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCD6BF5D21E919E10015F7A8 /* PBXContainerItemProxy */;
+               };

                DCD8A19C1E09EEA200E4FA0A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                DCD8A19C1E09EEA200E4FA0A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;


@@ -33258,11 +39596,6 @@
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = DCD8A1F41E09F91F00E4FA0A /* PBXContainerItemProxy */;
                };
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = DCD8A1F41E09F91F00E4FA0A /* PBXContainerItemProxy */;
                };

-               DCD8A1F81E09F97300E4FA0A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = DCD8A1F71E09F97300E4FA0A /* PBXContainerItemProxy */;
-               };

                DCD8A1FB1E09F99700E4FA0A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                DCD8A1FB1E09F99700E4FA0A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;


@@ -33278,76 +39611,56 @@
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = DCD8A2021E09FAE500E4FA0A /* PBXContainerItemProxy */;
                };
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        targetProxy = DCD8A2021E09FAE500E4FA0A /* PBXContainerItemProxy */;
                };

-               DCD8A2071E09FB1F00E4FA0A /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       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 */ = {
+               DCDA5E582124B9DC009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */;
-                       targetProxy = DCE4E6A91D7A38E700AFB96E /* PBXContainerItemProxy */;
+                       target = DC311E6E2124B8A8002F5EAE /* aks_real_witness */;
+                       targetProxy = DCDA5E572124B9DC009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E7B81D7A456500AFB96E /* PBXTargetDependency */ = {
+               DCDA5E5A2124BA2F009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */;
-                       targetProxy = DCE4E7B71D7A456500AFB96E /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCDA5E592124BA2F009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E7BC1D7A45ED00AFB96E /* PBXTargetDependency */ = {
+               DCDA5E5C2124BA54009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       name = libsecurity_smime_regressions;
-                       targetProxy = DCE4E7BB1D7A45ED00AFB96E /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCDA5E5B2124BA54009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E7D81D7A4B3500AFB96E /* PBXTargetDependency */ = {
+               DCDA5E5E2124BA79009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       name = libsecurity_smime_regressions;
-                       targetProxy = DCE4E7D71D7A4B3500AFB96E /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCDA5E5D2124BA79009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E7F11D7A4BEC00AFB96E /* PBXTargetDependency */ = {
+               DCDA5E622124BAD7009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */;
-                       targetProxy = DCE4E7F01D7A4BEC00AFB96E /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCDA5E612124BAD7009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E82A1D7A4F2500AFB96E /* PBXTargetDependency */ = {
+               DCDA5E642124BCA9009B11B2 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCE4E7F51D7A4DA800AFB96E /* secd */;
-                       targetProxy = DCE4E8291D7A4F2500AFB96E /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = DCDA5E632124BCA9009B11B2 /* PBXContainerItemProxy */;

                };
                };

-               DCE4E8621D7A58BA00AFB96E /* PBXTargetDependency */ = {
+               DCE27861245B81BD00381FE8 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = DCE4E82D1D7A57AE00AFB96E /* trustd_macos */;
-                       targetProxy = DCE4E8611D7A58BA00AFB96E /* PBXContainerItemProxy */;
+                       target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
+                       targetProxy = DCE27860245B81BD00381FE8 /* PBXContainerItemProxy */;

                };
                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCE4E8931D7F34F600AFB96E /* authd */;
                        targetProxy = DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */;
                };
                };
                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCE4E8931D7F34F600AFB96E /* authd */;
                        targetProxy = DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */;
                };

-               DCE4E90C1D7F3B4A00AFB96E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCE4E8DC1D7F39DB00AFB96E /* Cloud Keychain Utility */;
-                       targetProxy = DCE4E90B1D7F3B4A00AFB96E /* PBXContainerItemProxy */;
-               };
-               DCE4E9731D7F3FC200AFB96E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCE4E9101D7F3D5300AFB96E /* Keychain Circle Notification */;
-                       targetProxy = DCE4E9721D7F3FC200AFB96E /* PBXContainerItemProxy */;
-               };

                DCE5DC171EA804E5006308A6 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
                        targetProxy = DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */;
                };
                DCE5DC171EA804E5006308A6 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52EC211D80CFB200B0A59C /* SOSCommands */;
                        targetProxy = DCE5DC161EA804E5006308A6 /* PBXContainerItemProxy */;
                };

+               DCF19A6E21AE2CDC002E808F /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       name = securitydservicectrl;
+                       targetProxy = DCF19A6D21AE2CDC002E808F /* PBXContainerItemProxy */;
+               };

                DCF785011D88B80600E694BB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCF7830A1D88B4DE00E694BB /* security_apple_csp */;
                DCF785011D88B80600E694BB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCF7830A1D88B4DE00E694BB /* security_apple_csp */;


@@ -33378,121 +39691,46 @@
                        target = DCF788AB1D88CD2400E694BB /* security_apple_x509_tp */;
                        targetProxy = DCF789451D88CD7C00E694BB /* PBXContainerItemProxy */;
                };
                        target = DCF788AB1D88CD2400E694BB /* security_apple_x509_tp */;
                        targetProxy = DCF789451D88CD7C00E694BB /* PBXContainerItemProxy */;
                };

-               E74583BE1BF66489001B54A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
-                       targetProxy = E74583BD1BF66489001B54A4 /* PBXContainerItemProxy */;
-               };
-               E745846D1BF68ECB001B54A4 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 05EF68BB194915A5007958C3 /* Security_executables_osx */;
-                       targetProxy = E745846C1BF68ECB001B54A4 /* PBXContainerItemProxy */;
-               };
-               E745846F1BF68ECB001B54A4 /* PBXTargetDependency */ = {
+               E060D1AB212478100025B833 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 05EF68C1194915FB007958C3 /* Security_kexts */;
-                       targetProxy = E745846E1BF68ECB001B54A4 /* PBXContainerItemProxy */;
+                       target = E060D1A62124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol */;
+                       targetProxy = E060D1AA212478100025B833 /* PBXContainerItemProxy */;

                };
                };

-               E74584711BF68ECB001B54A4 /* PBXTargetDependency */ = {
+               E060D1BA212478120025B833 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 05EF68AF1949149C007958C3 /* Security_temporary_UI */;
-                       targetProxy = E74584701BF68ECB001B54A4 /* PBXContainerItemProxy */;
+                       target = E060D1B6212478110025B833 /* OctagonTestHarnessXPCService */;
+                       targetProxy = E060D1B9212478120025B833 /* PBXContainerItemProxy */;

                };
                };

-               E79EEDD71CD3F9F800C2FBFC /* PBXTargetDependency */ = {
+               E060D1BC212478120025B833 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C7CFA2E14E1BA4800DF9D95 /* Security_frameworks_ios */;
-                       targetProxy = E79EEDD61CD3F9F800C2FBFC /* PBXContainerItemProxy */;
+                       target = E060D1A62124780F0025B833 /* OctagonTestHarnessXPCServiceProtocol */;
+                       targetProxy = E060D1BB212478120025B833 /* PBXContainerItemProxy */;

                };
                };

-               E79EEDDF1CD3FFEA00C2FBFC /* PBXTargetDependency */ = {
+               E74583BE1BF66489001B54A4 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = E79EEDD81CD3FFC800C2FBFC /* Security_frameworks_osx */;
-                       targetProxy = E79EEDDE1CD3FFEA00C2FBFC /* PBXContainerItemProxy */;
+                       target = 52D82BDD16A621F70078DFE5 /* CloudKeychainProxy */;
+                       targetProxy = E74583BD1BF66489001B54A4 /* PBXContainerItemProxy */;

                };
                };

-               E79EEDE51CD4001300C2FBFC /* PBXTargetDependency */ = {
+               E745846D1BF68ECB001B54A4 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        target = 05EF68BB194915A5007958C3 /* Security_executables_osx */;
                        isa = PBXTargetDependency;
                        target = 05EF68BB194915A5007958C3 /* Security_executables_osx */;

-                       targetProxy = E79EEDE41CD4001300C2FBFC /* PBXContainerItemProxy */;
+                       targetProxy = E745846C1BF68ECB001B54A4 /* PBXContainerItemProxy */;

                };
                E79EEDE71CD4003900C2FBFC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = E79EEDD81CD3FFC800C2FBFC /* Security_frameworks_osx */;
                        targetProxy = E79EEDE61CD4003900C2FBFC /* PBXContainerItemProxy */;
                };
                };
                E79EEDE71CD4003900C2FBFC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = E79EEDD81CD3FFC800C2FBFC /* Security_frameworks_osx */;
                        targetProxy = E79EEDE61CD4003900C2FBFC /* PBXContainerItemProxy */;
                };

-               E7CFF6711C84F62900E3484E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
-                       targetProxy = E7CFF6701C84F62900E3484E /* PBXContainerItemProxy */;
-               };
-               E7CFF6731C84F62900E3484E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7D847CD1C6BE9720025BB44 /* KeychainCircleTests */;
-                       targetProxy = E7CFF6721C84F62900E3484E /* PBXContainerItemProxy */;
-               };
-               E7CFF6751C84F65D00E3484E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7CFF6471C84F61200E3484E /* Security_KeychainCircle */;
-                       targetProxy = E7CFF6741C84F65D00E3484E /* PBXContainerItemProxy */;
-               };
-               E7CFF6771C84F66A00E3484E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7CFF6471C84F61200E3484E /* Security_KeychainCircle */;
-                       targetProxy = E7CFF6761C84F66A00E3484E /* PBXContainerItemProxy */;
-               };
-               E7D847D11C6BE9720025BB44 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
-                       targetProxy = E7D847D01C6BE9720025BB44 /* PBXContainerItemProxy */;
-               };
-               EB0D30FA1EF12BFB00C3C17D /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E79EEDD21CD3F8AB00C2FBFC /* Security_tests_ios */;
-                       targetProxy = EB0D30F91EF12BFB00C3C17D /* PBXContainerItemProxy */;
-               };

                EB10557D1E14DFB60003C309 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EB1055741E14DF430003C309 /* SecCertificateFuzzer */;
                        targetProxy = EB10557C1E14DFB60003C309 /* PBXContainerItemProxy */;
                };
                EB10557D1E14DFB60003C309 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EB1055741E14DF430003C309 /* SecCertificateFuzzer */;
                        targetProxy = EB10557C1E14DFB60003C309 /* PBXContainerItemProxy */;
                };

-               EB10557F1E14DFBE0003C309 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB1055741E14DF430003C309 /* SecCertificateFuzzer */;
-                       targetProxy = EB10557E1E14DFBE0003C309 /* PBXContainerItemProxy */;
-               };

                EB108F1F1E6CE4D2003B0456 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = EB108F201E6CE4D2003B0456 /* PBXContainerItemProxy */;
                };
                EB108F1F1E6CE4D2003B0456 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = EB108F201E6CE4D2003B0456 /* PBXContainerItemProxy */;
                };

-               EB11965A20A6300600BFDA1B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4809F7A42061B697003E72D0 /* MultiPeerSimulatorTests */;
-                       targetProxy = EB11965920A6300600BFDA1B /* PBXContainerItemProxy */;
-               };
-               EB11965C20A6301100BFDA1B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4809F7A42061B697003E72D0 /* MultiPeerSimulatorTests */;
-                       targetProxy = EB11965B20A6301100BFDA1B /* PBXContainerItemProxy */;
-               };
-               EB11965E20A6302100BFDA1B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4809F7A42061B697003E72D0 /* MultiPeerSimulatorTests */;
-                       targetProxy = EB11965D20A6302100BFDA1B /* PBXContainerItemProxy */;
-               };
-               EB1C4CA71E85883900404981 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
-                       targetProxy = EB1C4CA61E85883900404981 /* PBXContainerItemProxy */;
-               };
-               EB1C4CA91E85883900404981 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
-                       targetProxy = EB1C4CA81E85883900404981 /* PBXContainerItemProxy */;
-               };
-               EB1C4CAB1E85883900404981 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
-                       targetProxy = EB1C4CAA1E85883900404981 /* PBXContainerItemProxy */;
-               };

                EB1C4CB21E85884300404981 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
                EB1C4CB21E85884300404981 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;


@@ -33518,6 +39756,11 @@
                        target = EB27FF101E402CD300EC9E3A /* ckksctl */;
                        targetProxy = EB27FF271E40717400EC9E3A /* PBXContainerItemProxy */;
                };
                        target = EB27FF101E402CD300EC9E3A /* ckksctl */;
                        targetProxy = EB27FF271E40717400EC9E3A /* PBXContainerItemProxy */;
                };

+               EB2ED4E922547DE900E98082 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB27FF101E402CD300EC9E3A /* ckksctl */;
+                       targetProxy = EB2ED4E822547DE900E98082 /* PBXContainerItemProxy */;
+               };

                EB31EA831D3EF2FB008F952A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
                EB31EA831D3EF2FB008F952A /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;


@@ -33543,55 +39786,90 @@
                        target = E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */;
                        targetProxy = EB58A05B1E74C517009C10D7 /* PBXContainerItemProxy */;
                };
                        target = E79EEDA71CD3F87B00C2FBFC /* Security_tests_osx */;
                        targetProxy = EB58A05B1E74C517009C10D7 /* PBXContainerItemProxy */;
                };

-               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */ = {
+               EB58A05E1E74C51F009C10D7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = E79EEDD21CD3F8AB00C2FBFC /* Security_tests_ios */;
+                       targetProxy = EB58A05D1E74C51F009C10D7 /* PBXContainerItemProxy */;
+               };
+               EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EBB839A41E29665D00853BAC /* secfuzzer */;
+                       targetProxy = EB58A0611E74C8E4009C10D7 /* PBXContainerItemProxy */;
+               };
+               EB63ADE11C3E74F900C45A69 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = EB0BC9361C3C791500785842 /* secedumodetest */;
+                       targetProxy = EB63ADE01C3E74F900C45A69 /* PBXContainerItemProxy */;
+               };
+               EB694DAF2239E59600F02C1C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = EB694DAE2239E59600F02C1C /* PBXContainerItemProxy */;
+               };
+               EB694DC42239E5A200F02C1C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
+                       targetProxy = EB694DC32239E5A200F02C1C /* PBXContainerItemProxy */;
+               };
+               EB694DC82239E5F200F02C1C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 5EBE24791B00CCAE0007DB0E /* secacltests */;
+                       targetProxy = EB694DC72239E5F200F02C1C /* PBXContainerItemProxy */;
+               };
+               EB694DCE223A086C00F02C1C /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = EB694DCD223A086C00F02C1C /* PBXContainerItemProxy */;
+               };
+               EB694DD0223A087700F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = E79EEDD21CD3F8AB00C2FBFC /* Security_tests_ios */;
-                       targetProxy = EB58A05D1E74C51F009C10D7 /* PBXContainerItemProxy */;
+                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
+                       targetProxy = EB694DCF223A087700F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB58A0601E74C8D9009C10D7 /* PBXTargetDependency */ = {
+               EB694E72223AB78E00F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EBB839A41E29665D00853BAC /* secfuzzer */;
-                       targetProxy = EB58A05F1E74C8D9009C10D7 /* PBXContainerItemProxy */;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = EB694E71223AB78E00F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */ = {
+               EB694E87223AB79400F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EBB839A41E29665D00853BAC /* secfuzzer */;
-                       targetProxy = EB58A0611E74C8E4009C10D7 /* PBXContainerItemProxy */;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = EB694E86223AB79400F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB636BCA20992D8900C1E21A /* PBXTargetDependency */ = {
+               EB694E89223AB79B00F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
-                       targetProxy = EB636BC920992D8900C1E21A /* PBXContainerItemProxy */;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = EB694E88223AB79B00F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB636BD120992DA300C1E21A /* PBXTargetDependency */ = {
+               EB694E8B223AB7A200F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
-                       targetProxy = EB636BD020992DA300C1E21A /* PBXContainerItemProxy */;
+                       target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
+                       targetProxy = EB694E8A223AB7A200F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB636BD320992DB400C1E21A /* PBXTargetDependency */ = {
+               EB69527F223B75C300F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
-                       targetProxy = EB636BD220992DB400C1E21A /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = EB695280223B75C300F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB636BD520992DC000C1E21A /* PBXTargetDependency */ = {
+               EB695283223B75C300F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB49B2AD202D877F003F34A0 /* secdmockaks */;
-                       targetProxy = EB636BD420992DC000C1E21A /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = EB695284223B75C300F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB63ADE11C3E74F900C45A69 /* PBXTargetDependency */ = {
+               EB695285223B75C300F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB0BC9361C3C791500785842 /* secedumodetest */;
-                       targetProxy = EB63ADE01C3E74F900C45A69 /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = EB695286223B75C300F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB6A6FAD1B90F84D0045DC68 /* PBXTargetDependency */ = {
+               EB695287223B75C300F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 0C7CFA2E14E1BA4800DF9D95 /* Security_frameworks_ios */;
-                       targetProxy = EB6A6FAC1B90F84D0045DC68 /* PBXContainerItemProxy */;
+                       target = DC52EC3E1D80D00800B0A59C /* libSWCAgent */;
+                       targetProxy = EB695288223B75C300F02C1C /* PBXContainerItemProxy */;

                };
                };

-               EB6A6FB91B90F8D70045DC68 /* PBXTargetDependency */ = {
+               EB6952BB223B75FC00F02C1C /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 4C541F840F250BF500E508AE /* Security_executables_ios */;
-                       targetProxy = EB6A6FB81B90F8D70045DC68 /* PBXContainerItemProxy */;
+                       target = EB69527E223B75C300F02C1C /* secitemd */;
+                       targetProxy = EB6952BA223B75FC00F02C1C /* PBXContainerItemProxy */;

                };
                EB6A6FBB1B90F8EC0045DC68 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                EB6A6FBB1B90F8EC0045DC68 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -33603,100 +39881,65 @@
                        target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
                        targetProxy = EB6A6FBC1B90F9170045DC68 /* PBXContainerItemProxy */;
                };
                        target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
                        targetProxy = EB6A6FBC1B90F9170045DC68 /* PBXContainerItemProxy */;
                };

-               EB8910F120E0287600DE533F /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = EB8910F020E0287600DE533F /* PBXContainerItemProxy */;
-               };
-               EB8910F820E0287E00DE533F /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = EB8910F720E0287E00DE533F /* PBXContainerItemProxy */;
-               };
-               EB8910FE20E06DF500DE533F /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
-                       targetProxy = EB8910FD20E06DF500DE533F /* PBXContainerItemProxy */;
-               };
-               EB89FAFE20DBDAA800085498 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
-                       targetProxy = EB89FAFD20DBDAA800085498 /* PBXContainerItemProxy */;
-               };
-               EB89FB0020DBDAA800085498 /* PBXTargetDependency */ = {
+               EB74CBD622077CC600F1BBAD /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
-                       targetProxy = EB89FAFF20DBDAA800085498 /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = EB74CBD522077CC600F1BBAD /* PBXContainerItemProxy */;

                };
                };

-               EB89FB0220DBDAA800085498 /* PBXTargetDependency */ = {
+               EB74CC232207E99700F1BBAD /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
-                       targetProxy = EB89FB0120DBDAA800085498 /* PBXContainerItemProxy */;
+                       target = EB74CC152207E48000F1BBAD /* KeychainSettings */;
+                       targetProxy = EB74CC222207E99700F1BBAD /* PBXContainerItemProxy */;

                };
                };

-               EB9C1DB71BDFD51800F89272 /* PBXTargetDependency */ = {
+               EB89085721F17D3C00F0DDDB /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
-                       targetProxy = EB9C1DB61BDFD51800F89272 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = EB89085821F17D3C00F0DDDB /* PBXContainerItemProxy */;

                };
                };

-               EB9FE08D1BFBC48F004FEAAF /* PBXTargetDependency */ = {
+               EB89085B21F17D3C00F0DDDB /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
-                       targetProxy = EB9FE08C1BFBC48F004FEAAF /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = EB89085C21F17D3C00F0DDDB /* PBXContainerItemProxy */;

                };
                };

-               EB9FE0B61BFBC499004FEAAF /* PBXTargetDependency */ = {
+               EB89085D21F17D3C00F0DDDB /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
-                       targetProxy = EB9FE0B51BFBC499004FEAAF /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = EB89085E21F17D3C00F0DDDB /* PBXContainerItemProxy */;

                };
                };

-               EBA62C151EAD34C60096B33A /* PBXTargetDependency */ = {
+               EB89086521F17D3C00F0DDDB /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
-                       targetProxy = EBA62C141EAD34C60096B33A /* PBXContainerItemProxy */;
+                       target = DC52EC3E1D80D00800B0A59C /* libSWCAgent */;
+                       targetProxy = EB89086621F17D3C00F0DDDB /* PBXContainerItemProxy */;

                };
                };

-               EBA62C1C1EAD34CD0096B33A /* PBXTargetDependency */ = {
+               EB8908A221F17E3B00F0DDDB /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
-                       targetProxy = EBA62C1B1EAD34CD0096B33A /* PBXContainerItemProxy */;
+                       target = EB89085621F17D3C00F0DDDB /* recovery_securityd */;
+                       targetProxy = EB8908A121F17E3B00F0DDDB /* PBXContainerItemProxy */;

                };
                EBA9AA891CE3E76C004E2B68 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */;
                        targetProxy = EBA9AA881CE3E76C004E2B68 /* PBXContainerItemProxy */;
                };
                };
                EBA9AA891CE3E76C004E2B68 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */;
                        targetProxy = EBA9AA881CE3E76C004E2B68 /* PBXContainerItemProxy */;
                };

-               EBB696D41BE2085700715F16 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB9C1D791BDFD0E000F89272 /* secbackupntest */;
-                       targetProxy = EBB696D31BE2085700715F16 /* PBXContainerItemProxy */;
-               };
-               EBC15EA91BE29AC3001C0C5B /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
-                       targetProxy = EBC15EA81BE29AC3001C0C5B /* PBXContainerItemProxy */;
-               };
-               EBC73F52209A705A00AE3350 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6C46056B1F882B9B001421B6 /* KeychainAnalyticsTests */;
-                       targetProxy = EBC73F51209A705A00AE3350 /* PBXContainerItemProxy */;
-               };
-               EBC73F5D209A739600AE3350 /* PBXTargetDependency */ = {
+               EBB8521022F793A200424FD0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */;
-                       targetProxy = EBC73F5C209A739600AE3350 /* PBXContainerItemProxy */;
+                       target = EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */;
+                       targetProxy = EBB8520F22F793A200424FD0 /* PBXContainerItemProxy */;

                };
                };

-               EBC73F64209A73A100AE3350 /* PBXTargetDependency */ = {
+               EBB8521222F793AC00424FD0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */;
-                       targetProxy = EBC73F63209A73A100AE3350 /* PBXContainerItemProxy */;
+                       target = EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */;
+                       targetProxy = EBB8521122F793AC00424FD0 /* PBXContainerItemProxy */;

                };
                };

-               EBC73F66209A73A100AE3350 /* PBXTargetDependency */ = {
+               EBB8521622F793CF00424FD0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
-                       targetProxy = EBC73F65209A73A100AE3350 /* PBXContainerItemProxy */;
+                       target = EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */;
+                       targetProxy = EBB8521522F793CF00424FD0 /* PBXContainerItemProxy */;

                };
                };

-               EBCE15101FE638A2002E7CCC /* PBXTargetDependency */ = {
+               EBB8521822F793EF00424FD0 /* PBXTargetDependency */ = {

                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;

-                       target = EB056E3D1FE5E390000A771E /* DeviceSimulator */;
-                       targetProxy = EBCE150F1FE638A2002E7CCC /* PBXContainerItemProxy */;
+                       target = EBB851EB22F7912400424FD0 /* SecurityUtilitiesTests */;
+                       targetProxy = EBB8521722F793EF00424FD0 /* PBXContainerItemProxy */;

                };
                EBCF743F1CE593A700BED7CA /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                EBCF743F1CE593A700BED7CA /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;


@@ -33713,11 +39956,6 @@
                        target = DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */;
                        targetProxy = EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */;
                };
                        target = DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */;
                        targetProxy = EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */;
                };

-               EBD849361B242C8900C5FD1E /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4CE5A54C09C796E100D27A3F /* sslViewer */;
-                       targetProxy = EBD849351B242C8900C5FD1E /* PBXContainerItemProxy */;
-               };

                EBF374821DC058B60065D840 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;
                EBF374821DC058B60065D840 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;


@@ -33738,61 +39976,21 @@
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;
                        targetProxy = EBF374871DC058CC0065D840 /* PBXContainerItemProxy */;
                };
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;
                        targetProxy = EBF374871DC058CC0065D840 /* PBXContainerItemProxy */;
                };

-               EBFBC2B01E76582C00A34469 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB108F181E6CE4D2003B0456 /* KCPairingTests */;
-                       targetProxy = EBFBC2AF1E76582C00A34469 /* PBXContainerItemProxy */;
-               };
-               EBFBC2B21E76585500A34469 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = E7D847C41C6BE9710025BB44 /* KeychainCircle */;
-                       targetProxy = EBFBC2B11E76585500A34469 /* PBXContainerItemProxy */;
-               };
-               EBFBC2B41E76586700A34469 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = EBFBC2B31E76586700A34469 /* PBXContainerItemProxy */;
-               };
-               EBFBC2B61E76587800A34469 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = EBFBC2B51E76587800A34469 /* PBXContainerItemProxy */;
-               };

                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                EBFBC2BA1E76588A00A34469 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;

-                       target = DC8834011D8A218F00CE0ACA /* ASN1_not_installed */;
+                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;

                        targetProxy = EBFBC2B91E76588A00A34469 /* PBXContainerItemProxy */;
                };
                        targetProxy = EBFBC2B91E76588A00A34469 /* PBXContainerItemProxy */;
                };

-               EBFF18CE1F02BA66004E58FC /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = EB2D54A11F02A45E00E46890 /* secatomicfile */;
-                       targetProxy = EBFF18CD1F02BA66004E58FC /* PBXContainerItemProxy */;
-               };

                EBFF18D01F02C2FE004E58FC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BC8981D8B7CBD00070CB0 /* security_filedb */;
                        targetProxy = EBFF18CF1F02C2FE004E58FC /* PBXContainerItemProxy */;
                };
                EBFF18D01F02C2FE004E58FC /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BC8981D8B7CBD00070CB0 /* security_filedb */;
                        targetProxy = EBFF18CF1F02C2FE004E58FC /* PBXContainerItemProxy */;
                };

-               F621D0831ED6ED5B000EA569 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = F621D0271ED6DCE7000EA569 /* authorizationdump */;
-                       targetProxy = F621D0821ED6ED5B000EA569 /* PBXContainerItemProxy */;
-               };

                F667EC651E96EDCF00203D5C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
                        targetProxy = F667EC641E96EDCF00203D5C /* PBXContainerItemProxy */;
                };
                F667EC651E96EDCF00203D5C /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
                        targetProxy = F667EC641E96EDCF00203D5C /* PBXContainerItemProxy */;
                };

-               F667EC671E96FA4600203D5C /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = F667EC561E96E9B100203D5C /* authdtest */;
-                       targetProxy = F667EC661E96FA4600203D5C /* PBXContainerItemProxy */;
-               };
-               F94E7AE21ACC8E7700F23132 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = F93C49021AB8FCE00047E01A /* ckcdiagnose.sh */;
-                       targetProxy = F94E7AE11ACC8E7700F23132 /* PBXContainerItemProxy */;
-               };

 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */


@@ -33828,2165 +40026,3455 @@
                        name = CloudKeychain.strings;
                        sourceTree = "<group>";
                };
                        name = CloudKeychain.strings;
                        sourceTree = "<group>";
                };

-               6CF4A0C11E45488B00ECD7B5 /* Main.storyboard */ = {
+               BE197F2A19116FD100BA91D1 /* InfoPlist.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               6CF4A0C21E45488B00ECD7B5 /* Base */,
+                               BE197F2B19116FD100BA91D1 /* en */,

                        );
                        );

-                       name = Main.storyboard;
+                       name = InfoPlist.strings;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               6CF4A0EB1E4549F300ECD7B5 /* Main.storyboard */ = {
+               BE4AC9B818B8273600B84964 /* SharedWebCredentials.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               6CF4A0EC1E4549F300ECD7B5 /* Base */,
+                               BE4AC9B918B8273600B84964 /* English */,

                        );
                        );

-                       name = Main.storyboard;
+                       name = SharedWebCredentials.strings;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               6CF4A0F01E4549F300ECD7B5 /* LaunchScreen.storyboard */ = {
+               D479F6DF1F980F8F00388D28 /* Trust.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               6CF4A0F11E4549F300ECD7B5 /* Base */,
+                               D479F6E01F980F8F00388D28 /* English */,

                        );
                        );

-                       name = LaunchScreen.storyboard;
+                       name = Trust.strings;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               BE197F2A19116FD100BA91D1 /* InfoPlist.strings */ = {
+               D4C263CC1F952F6C001317EA /* SecErrorMessages.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               BE197F2B19116FD100BA91D1 /* en */,
+                               D4C263CD1F952F6C001317EA /* SecErrorMessages.strings */,
+                       );
+                       name = SecErrorMessages.strings;
+                       path = derived_src/en.lproj;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               DC0B622D1D909C4600D43BCB /* MainMenu.xib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DC0B622E1D909C4600D43BCB /* Base */,
+                       );
+                       name = MainMenu.xib;
+                       sourceTree = "<group>";
+               };
+               DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DC178A341D77A1F500B50D50 /* SecErrorMessages.strings */,
+                       );
+                       name = SecErrorMessages.strings;
+                       path = derived_src/en.lproj;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+                       usesTabs = 0;
+               };
+               DC178A381D77A1F500B50D50 /* InfoPlist.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DC178A391D77A1F500B50D50 /* en */,

                        );
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };
                        );
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };

-               BE4AC9B818B8273600B84964 /* SharedWebCredentials.strings */ = {
+               DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               BE4AC9B918B8273600B84964 /* English */,
+                               DC178A3C1D77A1F500B50D50 /* en */,

                        );
                        );

-                       name = SharedWebCredentials.strings;
+                       name = authorization.dfr.prompts.strings;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               D479F6DF1F980F8F00388D28 /* Trust.strings */ = {
+               DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */ = {

                        isa = PBXVariantGroup;
                        children = (
                        isa = PBXVariantGroup;
                        children = (

-                               D479F6E01F980F8F00388D28 /* English */,
+                               DC178A3E1D77A1F500B50D50 /* en */,

                        );
                        );

-                       name = Trust.strings;
+                       name = authorization.buttons.strings;
+                       sourceTree = "<group>";
+               };
+               DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DC178A401D77A1F500B50D50 /* en */,
+                       );
+                       name = authorization.prompts.strings;
+                       sourceTree = "<group>";
+               };
+               DCE4E9041D7F3A4800AFB96E /* InfoPlist.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DCE4E9051D7F3A4800AFB96E /* en */,
+                       );
+                       name = InfoPlist.strings;
+                       sourceTree = "<group>";
+               };
+               DCE4E9061D7F3A4800AFB96E /* Credits.rtf */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DCE4E9071D7F3A4800AFB96E /* en */,
+                       );
+                       name = Credits.rtf;
+                       sourceTree = "<group>";
+               };
+               DCE4E9441D7F3E8700AFB96E /* Localizable.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DCE4E9451D7F3E8700AFB96E /* en */,
+                       );
+                       name = Localizable.strings;
+                       sourceTree = "<group>";
+               };
+               DCE4E9471D7F3E8700AFB96E /* InfoPlist.strings */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               DCE4E9481D7F3E8700AFB96E /* en */,
+                       );
+                       name = InfoPlist.strings;

                        sourceTree = "<group>";
                };
                        sourceTree = "<group>";
                };

-               D4C263CC1F952F6C001317EA /* SecErrorMessages.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               D4C263CD1F952F6C001317EA /* SecErrorMessages.strings */,
-                       );
-                       name = SecErrorMessages.strings;
-                       path = derived_src/en.lproj/;
-                       sourceTree = BUILT_PRODUCTS_DIR;
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+               05EF68BD194915A5007958C3 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               05EF68BE194915A5007958C3 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               0C0BDB35175685B000BC1A7E /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_NAME = secdtests;
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Debug;
+               };
+               0C0BDB36175685B000BC1A7E /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_NAME = secdtests;
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Release;
+               };
+               0C2BCBB71D06401F00ED7A2F /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Debug;
+               };
+               0C2BCBB81D06401F00ED7A2F /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Release;
+               };
+               0C2BCBCC1D0648D100ED7A2F /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Debug;
+               };
+               0C2BCBCD1D0648D100ED7A2F /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Release;
+               };
+               0C6799FA12F7C37C00712919 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               PRODUCT_NAME = dtlsTests;
+                       };
+                       name = Debug;
+               };
+               0C6799FB12F7C37C00712919 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = YES;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               PRODUCT_NAME = dtlsTests;
+                               ZERO_LINK = NO;
+                       };
+                       name = Release;
+               };
+               0C7CFA3014E1BA4800DF9D95 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               0C7CFA3114E1BA4800DF9D95 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               0C85E0011FB38BB6000343A7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "-";
+                               GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+                               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 = "$(SECURITY_XCTEST_DIRECTORY)";
+                               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 = (
+                                       "$(OTHER_LDFLAGS_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_UserManagement)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(OTHER_LDFLAGS_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_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.OTTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               USE_XCTRUNNER = YES;
+                       };
+                       name = Debug;
+               };
+               0C85E0021FB38BB6000343A7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "-";
+                               GCC_GENERATE_TEST_COVERAGE_FILES = YES;
+                               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 = "$(SECURITY_XCTEST_DIRECTORY)";
+                               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 = (
+                                       "$(OTHER_LDFLAGS_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",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(OTHER_LDFLAGS_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",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                               );
+                               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_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_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/sbin;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = "";
+                               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_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_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/sbin;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = "";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               0CA378E423876DD100090B7E /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               0CA378E523876DD100090B7E /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               0CCC227723F357EE00E1FCD0 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = 725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */;
+                       buildSettings = {
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               INFOPLIST_FILE = "keychain/OctagonTrust/ot-tests/OctagonTrustTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOCK_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",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CLOUDSERVICES)",
+                               );
+                               OTHER_SWIFT_FLAGS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTrustTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
+                               SWIFT_OBJC_BRIDGING_HEADER = "";
+                               SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = "";
+                       };
+                       name = Debug;
+               };
+               0CCC227823F357EE00E1FCD0 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = 725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */;
+                       buildSettings = {
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "NDEBUG=1",
+                                       "$(inherited)",
+                               );
+                               INFOPLIST_FILE = "keychain/OctagonTrust/ot-tests/OctagonTrustTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOCK_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",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CLOUDSERVICES)",
+                               );
+                               OTHER_SWIFT_FLAGS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTrustTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               SWIFT_OBJC_BRIDGING_HEADER = "";
+                               SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = "";
+                       };
+                       name = Release;

                };
                };

-               DC0B622D1D909C4600D43BCB /* MainMenu.xib */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC0B622E1D909C4600D43BCB /* Base */,
-                       );
-                       name = MainMenu.xib;
-                       sourceTree = "<group>";
+               0CD743AC23C3EC8000FA0EC5 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_STYLE = Automatic;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)";
+                               EXPORTED_SYMBOLS_FILE = "";
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/OctagonTrust/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+                               LD_RUNPATH_SEARCH_PATHS = "";
+                               MODULEMAP_FILE = Modules/OctagonTrust.modulemap;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.octagontrust;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               SDKROOT = macosx.internal;
+                               SKIP_INSTALL = NO;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Debug;

                };
                };

-               DC178A331D77A1F500B50D50 /* SecErrorMessages.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC178A341D77A1F500B50D50 /* SecErrorMessages.strings */,
-                       );
-                       name = SecErrorMessages.strings;
-                       path = derived_src/en.lproj/;
-                       sourceTree = BUILT_PRODUCTS_DIR;
+               0CD743AD23C3EC8000FA0EC5 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_STYLE = Automatic;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               EXPORTED_SYMBOLS_FILE = "";
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/OctagonTrust/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+                               LD_RUNPATH_SEARCH_PATHS = "";
+                               MODULEMAP_FILE = Modules/OctagonTrust.modulemap;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.octagontrust;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               SDKROOT = macosx.internal;
+                               SKIP_INSTALL = NO;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Release;

                };
                };

-               DC178A381D77A1F500B50D50 /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC178A391D77A1F500B50D50 /* en */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
+               225394B21E3080A600D3CD9B /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+                               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;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)",
+                                       "$(PROJECT_DIR)/header_symlinks/iOS/**",
+                                       "$(PROJECT_DIR)/OSX/utilities",
+                                       "$(PROJECT_DIR)/OSX/sec/ipc",
+                                       "$(PROJECT_DIR)/OSX/sectask",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_ssl",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(DSTROOT)/usr/local/include",
+                                       "${BUILT_PRODUCTS_DIR}/cstemp/**",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               WARNING_CFLAGS = (
+                                       "-Wno-deprecated-declarations",
+                                       "-Wglobal-constructors",
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "$(inherited)",
+                               );
+                       };
+                       name = Debug;

                };
                };

-               DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC178A3C1D77A1F500B50D50 /* en */,
-                       );
-                       name = "authorization.dfr.prompts-BBBAA77A32-C4EBFEA440.strings";
-                       sourceTree = "<group>";
+               225394B31E3080A600D3CD9B /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+                               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;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)",
+                                       "$(PROJECT_DIR)/header_symlinks/iOS/**",
+                                       "$(PROJECT_DIR)/OSX/utilities",
+                                       "$(PROJECT_DIR)/OSX/sec/ipc",
+                                       "$(PROJECT_DIR)/OSX/sectask",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_ssl",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(DSTROOT)/usr/local/include",
+                                       "${BUILT_PRODUCTS_DIR}/cstemp/**",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               WARNING_CFLAGS = (
+                                       "-Wno-deprecated-declarations",
+                                       "-Wglobal-constructors",
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "$(inherited)",
+                               );
+                       };
+                       name = Release;

                };
                };

-               DC178A3D1D77A1F500B50D50 /* authorization.buttons.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC178A3E1D77A1F500B50D50 /* en */,
-                       );
-                       name = authorization.buttons.strings;
-                       sourceTree = "<group>";
+               3D58394B21890FFB000ACA44 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = "$(inherited)";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );
+                               OTHER_TAPI_FLAGS_SOS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecExperimentTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;

                };
                };

-               DC178A3F1D77A1F500B50D50 /* authorization.prompts.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DC178A401D77A1F500B50D50 /* en */,
-                       );
-                       name = authorization.prompts.strings;
-                       sourceTree = "<group>";
+               3D58394C21890FFB000ACA44 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = "$(inherited)";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );
+                               OTHER_TAPI_FLAGS_SOS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecExperimentTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;

                };
                };

-               DCE4E9041D7F3A4800AFB96E /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DCE4E9051D7F3A4800AFB96E /* en */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
+               3DD1FF4B201C07F30086D049 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)",
+                                       "$(HEADER_SYMLINKS)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               PRODUCT_NAME = SecureTransport_macos_tests;
+                       };
+                       name = Debug;

                };
                };

-               DCE4E9061D7F3A4800AFB96E /* Credits.rtf */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DCE4E9071D7F3A4800AFB96E /* en */,
-                       );
-                       name = Credits.rtf;
-                       sourceTree = "<group>";
+               3DD1FF4C201C07F30086D049 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)",
+                                       "$(HEADER_SYMLINKS)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               PRODUCT_NAME = SecureTransport_macos_tests;
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;

                };
                };

-               DCE4E9441D7F3E8700AFB96E /* Localizable.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DCE4E9451D7F3E8700AFB96E /* en */,
-                       );
-                       name = Localizable.strings;
-                       sourceTree = "<group>";
+               3DD1FFCE201FDB1D0086D049 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)",
+                                       "$(HEADER_SYMLINKS)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               PRODUCT_NAME = SecureTransport_ios_tests;
+                               SDKROOT = iphoneos.internal;
+                       };
+                       name = Debug;

                };
                };

-               DCE4E9471D7F3E8700AFB96E /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               DCE4E9481D7F3E8700AFB96E /* en */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
+               3DD1FFCF201FDB1D0086D049 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)",
+                                       "$(HEADER_SYMLINKS)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               PRODUCT_NAME = SecureTransport_ios_tests;
+                               SDKROOT = iphoneos.internal;
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;

                };
                };

-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-               05EF68B11949149C007958C3 /* Debug */ = {
+               3E4D49BA2531170600B124B3 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               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 = "";
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               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;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               05EF68B21949149C007958C3 /* Release */ = {
+               3E4D49BB2531170600B124B3 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               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 = "";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               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;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               05EF68B719491512007958C3 /* Debug */ = {
+               3E88360F24F068EF00E9F4D6 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               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 = "";
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               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;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               05EF68B819491512007958C3 /* Release */ = {
+               3E88361024F068EF00E9F4D6 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               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 = "";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               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;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               05EF68BD194915A5007958C3 /* Debug */ = {
+               438169101B4EDCBD00C54D58 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               COMBINE_HIDPI_IMAGES = YES;
+                               INFOPLIST_FILE = SOSCCAuthPlugin/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Authentication/AppleIDAuthenticationDelegates";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SOSCCAuthPlugin;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               05EF68BE194915A5007958C3 /* Release */ = {
+               438169111B4EDCBD00C54D58 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               COMBINE_HIDPI_IMAGES = YES;
+                               INFOPLIST_FILE = SOSCCAuthPlugin/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Authentication/AppleIDAuthenticationDelegates";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SOSCCAuthPlugin;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               05EF68C3194915FB007958C3 /* Debug */ = {
+               470415D31E5E14B6001F3D95 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = macosx.internal;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               05EF68C4194915FB007958C3 /* Release */ = {
+               470415D41E5E14B6001F3D95 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = NO;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = macosx.internal;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C0BDB35175685B000BC1A7E /* Debug */ = {
+               4718AE2B205B39620068EC3F /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "LIBTRUSTD=1",
+                                       "SECD_SERVER=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INSTALL_PATH = /usr/local/bin;
+                               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 = (

-                                       "-ObjC",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

+                                       "$(OTHER_LDFLAGS_APS)",

                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );

-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
+                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
+                                       "$(OTHER_LDFLAGS)",

                                        "-framework",
                                        MobileKeyBag,
                                        "-laks",
                                        "-lACM",
                                        "-framework",
                                        MobileKeyBag,
                                        "-laks",
                                        "-lACM",

-                                       "-lImg4Decode",
-                                       "-lz",
+                                       "-ObjC",

                                        "-lSystem",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-lSystem",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

-                                       "-framework",
-                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );

-                               PRODUCT_NAME = secdtests;
+                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                               );
+                               PRODUCT_NAME = securityd;

                                STRIP_STYLE = debugging;
                                STRIP_STYLE = debugging;

+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C0BDB36175685B000BC1A7E /* Release */ = {
+               4718AE2C205B39620068EC3F /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "LIBTRUSTD=1",
+                                       "SECD_SERVER=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INSTALL_PATH = /usr/local/bin;
+                               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 = (

-                                       "-ObjC",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

+                                       "$(OTHER_LDFLAGS_APS)",

                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );

-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
+                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
+                                       "$(OTHER_LDFLAGS)",

                                        "-framework",
                                        MobileKeyBag,
                                        "-laks",
                                        "-lACM",
                                        "-framework",
                                        MobileKeyBag,
                                        "-laks",
                                        "-lACM",

-                                       "-lImg4Decode",
-                                       "-lz",

                                        "-lSystem",
                                        "-lSystem",

+                                       "-ObjC",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

-                                       "-framework",
-                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                );

-                               PRODUCT_NAME = secdtests;
+                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                               );
+                               PRODUCT_NAME = securityd;

                                STRIP_STYLE = debugging;
                                STRIP_STYLE = debugging;

+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C2BCBB71D06401F00ED7A2F /* Debug */ = {
+               4718AEE0205B39C40068EC3F /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               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;
+                               EXECUTABLE_PREFIX = "";
+                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               MTL_ENABLE_DEBUG_INFO = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C2BCBB81D06401F00ED7A2F /* Release */ = {
+               4718AEE1205B39C40068EC3F /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               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;
+                               EXECUTABLE_PREFIX = "";
+                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               MTL_ENABLE_DEBUG_INFO = NO;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C2BCBCC1D0648D100ED7A2F /* Debug */ = {
+               4727FBBC1F9918590003AE36 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_COREANALYTICS)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               SDKROOT = iphoneos.internal;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C2BCBCD1D0648D100ED7A2F /* Release */ = {
+               4727FBBD1F9918590003AE36 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = secdxctests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_COREANALYTICS)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               SDKROOT = iphoneos.internal;
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C6799FA12F7C37C00712919 /* Debug */ = {
+               47702B231E5F409700B29577 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                       };
+                       name = Debug;
+               };
+               47702B241E5F409700B29577 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;

                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;

+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                       };
+                       name = Release;
+               };
+               47702B331E5F492C00B29577 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
+                               DEBUG_INFORMATION_FORMAT = dwarf;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_DYNAMIC_NO_PIC = NO;

-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = dtlsTests;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C6799FB12F7C37C00712919 /* Release */ = {
+               47702B341E5F492C00B29577 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               COPY_PHASE_STRIP = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               PRODUCT_NAME = dtlsTests;
-                               ZERO_LINK = NO;
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C7CFA3014E1BA4800DF9D95 /* Debug */ = {
+               4771D976209A755800BA9772 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/DataclassOwners";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               TARGETED_DEVICE_FAMILY = "1,2,6";
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C7CFA3114E1BA4800DF9D95 /* Release */ = {
+               4771D977209A755800BA9772 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/DataclassOwners";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               TARGETED_DEVICE_FAMILY = "1,2,6";
+                               VALIDATE_PRODUCT = YES;
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C85E0011FB38BB6000343A7 /* Debug */ = {
+               47C2F1882059CB690062DE30 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               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_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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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";
+                               INFOPLIST_FILE = keychain/KeychainResources/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Keychain";
+                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                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_BUNDLE_IDENTIFIER = com.apple.KeychainResources;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_XCTRUNNER = YES;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C85E0021FB38BB6000343A7 /* Release */ = {
+               47C2F1892059CB690062DE30 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_STYLE = Automatic;
+                               ENABLE_NS_ASSERTIONS = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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";
+                               INFOPLIST_FILE = keychain/KeychainResources/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Keychain";
+                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                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_BUNDLE_IDENTIFIER = com.apple.KeychainResources;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_XCTRUNNER = YES;
+                               TARGETED_DEVICE_FAMILY = "1,2";

                                VALIDATE_PRODUCT = YES;
                                VALIDATE_PRODUCT = YES;

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C8BBF061FCB446400580909 /* Debug */ = {
+               47C51B8C1EEA657D0032D9E5 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "keychain/otctl/otctl-Entitlements.plist";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               CODE_SIGN_ENTITLEMENTS = keychain/SecurityUnitTests/SecurityUnitTests.entitlements;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               DEBUG_INFORMATION_FORMAT = dwarf;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /usr/local/bin;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = keychain/SecurityUnitTests/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               USES_XCTRUNNER = YES;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C8BBF071FCB446400580909 /* Release */ = {
+               47C51B8D1EEA657D0032D9E5 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_COMMA = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_STRICT_PROTOTYPES = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "keychain/otctl/otctl-Entitlements.plist";
+                               CODE_SIGN_ENTITLEMENTS = keychain/SecurityUnitTests/SecurityUnitTests.entitlements;
+                               COMBINE_HIDPI_IMAGES = YES;

                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /usr/local/bin;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = keychain/SecurityUnitTests/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               USES_XCTRUNNER = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               0C9AEEB520783FBB00BF6237 /* Debug */ = {
+               4C52D0BE16EFC61E0079966E /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = CircleJoinRequested/entitlements.plist;
+                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "NO_SERVER=1",
+                                       "DEBUG=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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)",
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(PROJECT_DIR)/libsecurity_smime",
+                                       "$(PROJECT_DIR)/OSX/include",
+                                       "$(PROJECT_DIR)/OSX/sec",
+                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle",
+                                       "$(PROJECT_DIR)/OSX/utilities",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                                       "$(PROJECT_DIR)/OSX/",
+                                       "$(SDKROOT)/System/Library/PrivateFrameworks",
+                                       "$(SDKROOT)/System/Library/PrivateFrameworks/CloudServices/Headers",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "$(APPLE_AKS_LIBRARY)",
+                               INSTALL_PATH = /System/Library/Frameworks/Security.framework/CircleJoinRequested/;
+                               ONLY_ACTIVE_ARCH = YES;
+                               OTHER_CFLAGS = (
+                                       "-fconstant-cfstrings",
+                                       "-fno-inline",
+                                       "-DDEBUG",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(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.SFTMTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_XCTRUNNER = YES;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0C9AEEB620783FBB00BF6237 /* Release */ = {
+               4C52D0BF16EFC61E0079966E /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_ENTITLEMENTS = CircleJoinRequested/entitlements.plist;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               HEADER_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "$(PROJECT_DIR)",
+                                       "$(SDKROOT)/usr/local/include/security_libDER",
+                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "$(PROJECT_DIR)/libsecurity_smime",
+                                       "$(PROJECT_DIR)/OSX/include",
+                                       "$(PROJECT_DIR)/OSX/sec",
+                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle",
+                                       "$(PROJECT_DIR)/OSX/utilities",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                                       "$(PROJECT_DIR)/OSX/",
+                                       "$(SDKROOT)/System/Library/PrivateFrameworks",
+                                       "$(SDKROOT)/System/Library/PrivateFrameworks/CloudServices/Headers",

                                );
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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;
+                               INSTALL_PATH = /System/Library/Frameworks/Security.framework/CircleJoinRequested/;

                                OTHER_LDFLAGS = (
                                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_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(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.SFTMTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_XCTRUNNER = YES;

                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };

-               0CF4064E2072E3E3003D6A7F /* Debug */ = {
+               4C541F870F250BF500E508AE /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               PRODUCT_NAME = phase2;
+                       };
+                       name = Debug;
+               };
+               4C541F8A0F250BF500E508AE /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = phase2;
+                       };
+                       name = Release;
+               };
+               4C711D7413AFCD0900FE865D /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
+                               COMBINE_HIDPI_IMAGES = YES;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "NO_SERVER=1",
+                                       "LIBTRUSTD=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                               );
+                               INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(inherited)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(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_PROTOBUF)",

-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
+                               PRODUCT_NAME = SecurityDevTests;
+                               STRIP_STYLE = debugging;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               0CF4064F2072E3E3003D6A7F /* Release */ = {
+               4C711D7513AFCD0900FE865D /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
+                               COMBINE_HIDPI_IMAGES = YES;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "NO_SERVER=1",
+                                       "LIBTRUSTD=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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;
+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)/OSX/regressions",
+                               );
+                               INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(inherited)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(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_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

-                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
+                               PRODUCT_NAME = SecurityDevTests;
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Release;
+               };
+               4C9DE9D41181AC4900CF5C27 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",

                                        "-framework",
                                        "-framework",

-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       CFNetwork,

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
-                               VALIDATE_PRODUCT = YES;
+                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "-framework",
+                                       MobileKeyBag,
+                                       "-laks",
+                                       "-lACM",
+                               );
+                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               PRODUCT_NAME = sslEcdsa;
+                       };
+                       name = Debug;
+               };
+               4C9DE9D51181AC4900CF5C27 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               INSTALL_PATH = /usr/local/bin;
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "-framework",
+                                       MobileKeyBag,
+                                       "-laks",
+                                       "-lACM",
+                               );
+                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                               );
+                               PRODUCT_NAME = sslEcdsa;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               225394B21E3080A600D3CD9B /* Debug */ = {
+               52D82BE916A621F80078DFE5 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;

                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;

-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_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_UNREACHABLE_CODE = YES;

                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               CODE_SIGN_ENTITLEMENTS = KVSKeychainSyncingProxy/cloudkeychain.entitlements.plist;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
+                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = "";

                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/header_symlinks/iOS/**",
-                                       "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
-                                       "$(PROJECT_DIR)/OSX/utilities",
-                                       "$(PROJECT_DIR)/OSX/sec/ipc",
-                                       "$(PROJECT_DIR)/OSX/sectask",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_ssl",
-                                       "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(DSTROOT)/usr/local/include",
-                                       "${BUILT_PRODUCTS_DIR}/cstemp/**",
+                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle/CKBridge",

                                );
                                );

-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               WARNING_CFLAGS = (
-                                       "-Wno-deprecated-declarations",
-                                       "-Wglobal-constructors",
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                                       "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
-                                       "-Wno-vla-extension",
+                               INFOPLIST_FILE = "KVSKeychainSyncingProxy/CloudKeychainProxy-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_RESOURCES_DIR)";
+                               MACH_O_TYPE = mh_execute;
+                               ONLY_ACTIVE_ARCH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "-ObjC",

                                );
                                );

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.cloudkeychainproxy3;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               STRIP_STYLE = all;
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               225394B31E3080A600D3CD9B /* Release */ = {
+               52D82BEA16A621F80078DFE5 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_OBJC_ARC = YES;

                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;

-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_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_UNREACHABLE_CODE = YES;

                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               CODE_SIGN_ENTITLEMENTS = KVSKeychainSyncingProxy/cloudkeychain.entitlements.plist;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = "";

                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)",
-                                       "$(PROJECT_DIR)/header_symlinks/iOS/**",
-                                       "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
-                                       "$(PROJECT_DIR)/OSX/utilities",
-                                       "$(PROJECT_DIR)/OSX/sec/ipc",
-                                       "$(PROJECT_DIR)/OSX/sectask",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_ssl",
-                                       "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(DSTROOT)/usr/local/include",
-                                       "${BUILT_PRODUCTS_DIR}/cstemp/**",
+                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle/CKBridge",

                                );
                                );

-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               WARNING_CFLAGS = (
-                                       "-Wno-deprecated-declarations",
-                                       "-Wglobal-constructors",
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                                       "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
-                                       "-Wno-vla-extension",
+                               INFOPLIST_FILE = "KVSKeychainSyncingProxy/CloudKeychainProxy-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_RESOURCES_DIR)";
+                               MACH_O_TYPE = mh_execute;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "-ObjC",

                                );
                                );

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.cloudkeychainproxy3;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               STRIP_STYLE = all;
+                               VALIDATE_PRODUCT = YES;
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               3DD1FF4B201C07F30086D049 /* Debug */ = {
+               5346480B17331E1200FE9172 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = NO;
+                               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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(PROJECT_DIR)",
-                                       "$(HEADER_SYMLINKS)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
+                                       "DEBUG=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
+                               INFOPLIST_FILE = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Info.plist";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Notification";
+                               MACH_O_TYPE = mh_dylib;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_APPLEACCOUNT)";
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               3DD1FF4C201C07F30086D049 /* Release */ = {
+               5346480C17331E1200FE9172 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = NO;
+                               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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(PROJECT_DIR)",
-                                       "$(HEADER_SYMLINKS)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(inherited)",
-                               );
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               INFOPLIST_FILE = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Info.plist";
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Notification";
+                               MACH_O_TYPE = mh_dylib;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_APPLEACCOUNT)";
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                VALIDATE_PRODUCT = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                VALIDATE_PRODUCT = YES;

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               3DD1FFCE201FDB1D0086D049 /* Debug */ = {
+               5A442F8E233C330F00918373 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               CODE_SIGN_ENTITLEMENTS = "experiment/tool/experimentTool-Entitlements.plist";
+                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(PROJECT_DIR)",
-                                       "$(HEADER_SYMLINKS)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(inherited)",
-                               );
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
-                               );
+                               INSTALL_PATH = /usr/sbin;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               3DD1FFCF201FDB1D0086D049 /* Release */ = {
+               5A442F8F233C330F00918373 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               CODE_SIGN_ENTITLEMENTS = "experiment/tool/experimentTool-Entitlements.plist";
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(PROJECT_DIR)",
-                                       "$(HEADER_SYMLINKS)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(inherited)",
-                               );
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
-                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework",
-                               );
+                               INSTALL_PATH = /usr/sbin;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecureTransportTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
-               438169101B4EDCBD00C54D58 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COMBINE_HIDPI_IMAGES = YES;
-                               INFOPLIST_FILE = SOSCCAuthPlugin/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Authentication/AppleIDAuthenticationDelegates";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SOSCCAuthPlugin;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               WRAPPER_EXTENSION = bundle;
-                       };
-                       name = Debug;
-               };
-               438169111B4EDCBD00C54D58 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COMBINE_HIDPI_IMAGES = YES;
-                               INFOPLIST_FILE = SOSCCAuthPlugin/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Authentication/AppleIDAuthenticationDelegates";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SOSCCAuthPlugin;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               470415D31E5E14B6001F3D95 /* Debug */ = {
+               5E10992A19A5E55800A60E2B /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_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_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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_DYNAMIC_NO_PIC = NO;

+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INFOPLIST_FILE = ISACLProtectedItems/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

+                               ONLY_ACTIVE_ARCH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.securityservices.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = macosx.internal;
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               470415D41E5E14B6001F3D95 /* Release */ = {
+               5E10992B19A5E55800A60E2B /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_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_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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
-                               COPY_PHASE_STRIP = NO;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COMBINE_HIDPI_IMAGES = YES;

                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INFOPLIST_FILE = ISACLProtectedItems/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.securityservices.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = macosx.internal;
+                               VALIDATE_PRODUCT = YES;
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4718AE2B205B39620068EC3F /* Debug */ = {
+               5EBE247E1B00CCAE0007DB0E /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "SECD_SERVER=1",
+                               CODE_SIGN_ENTITLEMENTS = "secacltests/secacltests-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "$(SDKROOT)/usr/local/lib",

                                );
                                );

-                               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 = (

+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-ObjC",
-                                       "-lSystem",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "-framework",
-                                       CrashReporterSupport,

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",

+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_AGGREGATEDICTIONARY)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
-                                       "$(inherited)",
-                                       "-ObjC",
-                               );
-                               PRODUCT_NAME = securityd;
-                               STRIP_STYLE = debugging;
-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4718AE2C205B39620068EC3F /* Release */ = {
+               5EBE247F1B00CCAE0007DB0E /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "SECD_SERVER=1",
+                               CODE_SIGN_ENTITLEMENTS = "secacltests/secacltests-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               LIBRARY_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "$(SDKROOT)/usr/local/lib",

                                );
                                );

-                               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 = (

+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lSystem",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "-framework",
-                                       CrashReporterSupport,

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",

+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_AGGREGATEDICTIONARY)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
-                                       "$(inherited)",
-                                       "-ObjC",
-                               );
-                               PRODUCT_NAME = securityd;
-                               STRIP_STYLE = debugging;
-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4718AEE0205B39C40068EC3F /* Debug */ = {
+               6C2045EF2424BA7F00F9461D /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               EXECUTABLE_PREFIX = "";
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/KeychainStasher/KeychainStasher.entitlements";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_C_LANGUAGE_STANDARD = gnu11;
+                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               INFOPLIST_FILE = "$(SRCROOT)/keychain/KeychainStasher/KeychainStasher-Info.plist";
+                               INSTALL_PATH = /usr/libexec;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainStasher;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = macosx.internal;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4718AEE1205B39C40068EC3F /* Release */ = {
+               6C2045F02424BA7F00F9461D /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               EXECUTABLE_PREFIX = "";
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/KeychainStasher/KeychainStasher.entitlements";
+                               CODE_SIGN_STYLE = Automatic;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_C_LANGUAGE_STANDARD = gnu11;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               INFOPLIST_FILE = "$(SRCROOT)/keychain/KeychainStasher/KeychainStasher-Info.plist";
+                               INSTALL_PATH = /usr/libexec;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainStasher;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = macosx.internal;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4727FBBC1F9918590003AE36 /* Debug */ = {
+               6C39237721F13E4D00D018AD /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                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;
                                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;
+                               CODE_SIGN_ENTITLEMENTS = "tests/SecDbBackupTests/SecDbBackupTests-Entitlements.plist";

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               INFOPLIST_FILE = secdxctests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "-L$(SDKROOT)/usr/local/lib",
-                                       "-laks",
-                                       "-laks_acl",
-                                       "-framework",
-                                       MobileKeyBag,
+                               INFOPLIST_FILE = "$(SOURCE_ROOT)/tests/SecDbBackupTests/Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
-                                       "-L$(SDKROOT)/usr/local/lib",
-                                       "-laks_acl",
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = iphoneos.internal;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4727FBBD1F9918590003AE36 /* Release */ = {
+               6C39237821F13E4D00D018AD /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                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;
                                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;
+                               CODE_SIGN_ENTITLEMENTS = "tests/SecDbBackupTests/SecDbBackupTests-Entitlements.plist";

                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               INFOPLIST_FILE = secdxctests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "-L$(SDKROOT)/usr/local/lib",
-                                       "-laks",
-                                       "-laks_acl",
-                                       "-framework",
-                                       MobileKeyBag,
+                               INFOPLIST_FILE = "$(SOURCE_ROOT)/tests/SecDbBackupTests/Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
-                                       "-L$(SDKROOT)/usr/local/lib",
-                                       "-laks_acl",
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = iphoneos.internal;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };

-               47702B231E5F409700B29577 /* Debug */ = {
+               6C4605B61F882B9B001421B6 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = macosx.internal;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               47702B241E5F409700B29577 /* Release */ = {
+               6C4605B71F882B9B001421B6 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );
+                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = macosx.internal;
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               47702B331E5F492C00B29577 /* Debug */ = {
+               6C7BE2E523C3DD64003BB2CA /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/iOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Debug;
+               };
+               6C7BE2E623C3DD64003BB2CA /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/iOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Release;
+               };
+               6C963285242A279B00C53CE2 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/stashtester/stashtester.entitlements";
+                               CODE_SIGN_STYLE = Manual;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               DEVELOPMENT_TEAM = "";
+                               GCC_C_LANGUAGE_STANDARD = gnu11;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;

-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               PROVISIONING_PROFILE_SPECIFIER = "";

                                SDKROOT = macosx.internal;
                        };
                        name = Debug;
                };
                                SDKROOT = macosx.internal;
                        };
                        name = Debug;
                };

-               47702B341E5F492C00B29577 /* Release */ = {
+               6C963286242A279B00C53CE2 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
-                               COPY_PHASE_STRIP = NO;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/stashtester/stashtester.entitlements";
+                               CODE_SIGN_STYLE = Manual;
+                               DEVELOPMENT_TEAM = "";

                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_C_LANGUAGE_STANDARD = gnu11;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;

+                               MACOSX_DEPLOYMENT_TARGET = 10.16;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               PROVISIONING_PROFILE_SPECIFIER = "";

                                SDKROOT = macosx.internal;
                        };
                        name = Release;
                };
                                SDKROOT = macosx.internal;
                        };
                        name = Release;
                };

-               4771D976209A755800BA9772 /* Debug */ = {
+               6C9AA7A31F7C1D9000D08296 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = 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;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supdctl/supdctl-Entitlements.plist";

                                CODE_SIGN_STYLE = Automatic;
                                CODE_SIGN_STYLE = Automatic;

-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/DataclassOwners";
-                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+                               INSTALL_PATH = /usr/local/bin;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = iphoneos.internal;
-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4771D977209A755800BA9772 /* Release */ = {
+               6C9AA7A41F7C1D9000D08296 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = 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;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supdctl/supdctl-Entitlements.plist";

                                CODE_SIGN_STYLE = Automatic;
                                CODE_SIGN_STYLE = Automatic;

+                               COPY_PHASE_STRIP = NO;

                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/DataclassOwners";
-                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+                               INSTALL_PATH = /usr/local/bin;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SDKROOT = iphoneos.internal;
-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               VALIDATE_PRODUCT = YES;
-                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               478D429A1FD72A8100CAB645 /* Debug */ = {
+               6CAA8D251F842FB4007B6E03 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = 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;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supd/securityuploadd-Entitlements.plist";

                                CODE_SIGN_STYLE = Automatic;
                                CODE_SIGN_STYLE = Automatic;

-                               DEBUG_INFORMATION_FORMAT = dwarf;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = secdxctests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
+                               INSTALL_PATH = /usr/libexec;
+                               "LAUNCHD_PLIST[sdk=iphoneos*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=iphonesimulator*]" = "$(SRCROOT)/supd/securityuploadd-sim.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;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               TARGETED_DEVICE_FAMILY = "1,2";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               478D429B1FD72A8100CAB645 /* Release */ = {
+               6CAA8D261F842FB4007B6E03 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = 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;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supd/securityuploadd-Entitlements.plist";

                                CODE_SIGN_STYLE = Automatic;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                CODE_SIGN_STYLE = Automatic;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = secdxctests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
+                               INSTALL_PATH = /usr/libexec;
+                               "LAUNCHD_PLIST[sdk=iphoneos*]" = "$(SRCROOT)/supd/securityuploadd-ios.plist";
+                               "LAUNCHD_PLIST[sdk=iphonesimulator*]" = "$(SRCROOT)/supd/securityuploadd-sim.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;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
+                               );

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               47C2F1882059CB690062DE30 /* Debug */ = {
+               6CCDF7891E3C25FB003F2555 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_STYLE = Automatic;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;

+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = keychain/KeychainResources/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Keychain";
-                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainResources;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               WRAPPER_EXTENSION = bundle;
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               47C2F1892059CB690062DE30 /* Release */ = {
+               6CCDF78A1E3C25FB003F2555 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_STYLE = Automatic;
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";
+                               COPY_PHASE_STRIP = NO;

                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_NS_ASSERTIONS = NO;

+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = keychain/KeychainResources/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Keychain";
-                               IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainResources;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               VALIDATE_PRODUCT = YES;
-                               WRAPPER_EXTENSION = bundle;
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               47C51B8C1EEA657D0032D9E5 /* Debug */ = {
+               6CF4A0C51E45488B00ECD7B5 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_STRICT_PROTOTYPES = NO;
-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";

                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               INFOPLIST_FILE = SecurityUnitTests/Info.plist;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               INFOPLIST_FILE = "$(SOURCE_ROOT)/tests/TestHostBinaries/KeychainEntitledTestApp/Info.plist";
+                               INFOPLIST_PREPROCESS = YES;
+                               INSTALL_PATH = /AppleInternal/Applications;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               OTHER_CODE_SIGN_FLAGS = "--deep";
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_AppFrameworks)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainEntitledTestApp;
+                               PRODUCT_NAME = KeychainEntitledTestApp;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               47C51B8D1EEA657D0032D9E5 /* Release */ = {
+               6CF4A0C61E45488B00ECD7B5 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_STRICT_PROTOTYPES = NO;
-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";

                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               INFOPLIST_FILE = SecurityUnitTests/Info.plist;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+                               INSTALL_PATH = /AppleInternal/Applications;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.SecurityUnitTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               OTHER_CODE_SIGN_FLAGS = "--deep";
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_AppFrameworks)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainEntitledTestApp;
+                               PRODUCT_NAME = KeychainEntitledTestApp;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4809F7A52061B697003E72D0 /* Debug */ = {
+               7913B20D0D172B3900601FE9 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_STYLE = Automatic;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslServer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "-framework",
+                                       MobileKeyBag,
+                                       "-laks",
+                                       "-lACM",
+                               );
+                               PRODUCT_NAME = sslServer;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4809F7A62061B697003E72D0 /* Release */ = {
+               7913B2100D172B3900601FE9 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_STYLE = Automatic;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslServer-entitlements.plist";
+                               INSTALL_PATH = /usr/local/bin;
+                               OTHER_LDFLAGS = "";
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "-framework",
+                                       MobileKeyBag,
+                                       "-laks",
+                                       "-lACM",
+                               );
+                               "OTHER_LDFLAGS[sdk=embeddedsimulator*][arch=*]" = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                               );
+                               PRODUCT_NAME = sslServer;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4C52D0BE16EFC61E0079966E /* Debug */ = {
+               792EFFDC0CBBF878007C00A0 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;

                        buildSettings = {
                        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_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 = CircleJoinRequested/entitlements.plist;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PROJECT_DIR)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(PROJECT_DIR)/libsecurity_smime",
-                                       "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
-                                       "$(PROJECT_DIR)/OSX/sec",
-                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle",
-                                       "$(PROJECT_DIR)/OSX/utilities",
-                                       "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(PROJECT_DIR)/OSX/",
-                                       "$(SDKROOT)/System/Library/PrivateFrameworks",
-                                       "$(SDKROOT)/System/Library/PrivateFrameworks/CloudServices/Headers",
-                               );
-                               INSTALL_PATH = /System/Library/Frameworks/Security.framework/CircleJoinRequested/;
-                               ONLY_ACTIVE_ARCH = YES;
-                               OTHER_CFLAGS = (
-                                       "-fconstant-cfstrings",
-                                       "-fno-inline",
-                                       "-DDEBUG",
-                               );
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               DEAD_CODE_STRIPPING = YES;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
+                               EXPORTED_SYMBOLS_FILE = "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).exp";
+                               FRAMEWORK_VERSION = B;
+                               INFOPLIST_FILE = "Security-Info.plist";
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
+                               MODULEMAP_FILE = Modules/Security.iOS.modulemap;

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               OTHER_TAPI_FLAGS = "--verify-api-error-as-warning -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;
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               Sim_Name = "";
+                               "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4C52D0BF16EFC61E0079966E /* Release */ = {
+               792EFFDD0CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;

                        buildSettings = {
                        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_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 = CircleJoinRequested/entitlements.plist;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               HEADER_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PROJECT_DIR)",
-                                       "$(SDKROOT)/usr/local/include/security_libDER",
-                                       "$(PROJECT_DIR)/OSX/libsecurity_asn1",
-                                       "$(PROJECT_DIR)/libsecurity_smime",
-                                       "$(PROJECT_DIR)/OSX/sec/ProjectHeaders",
-                                       "$(PROJECT_DIR)/OSX/sec",
-                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle",
-                                       "$(PROJECT_DIR)/OSX/utilities",
-                                       "$(PROJECT_DIR)/OSX/regressions",
-                                       "$(PROJECT_DIR)/OSX/",
-                                       "$(SDKROOT)/System/Library/PrivateFrameworks",
-                                       "$(SDKROOT)/System/Library/PrivateFrameworks/CloudServices/Headers",
-                               );
-                               INSTALL_PATH = /System/Library/Frameworks/Security.framework/CircleJoinRequested/;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
+                               COMBINE_HIDPI_IMAGES = YES;
+                               DEAD_CODE_STRIPPING = YES;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
+                               EXPORTED_SYMBOLS_FILE = "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).exp";
+                               FRAMEWORK_VERSION = B;
+                               INFOPLIST_FILE = "Security-Info.plist";
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
+                               MODULEMAP_FILE = Modules/Security.iOS.modulemap;

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
-                               VALIDATE_PRODUCT = YES;
+                               OTHER_TAPI_FLAGS = "--verify-api-error-as-warning -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;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4C541F870F250BF500E508AE /* Debug */ = {
+               792EFFDE0CBBF878007C00A0 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = phase2;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/iOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               "INSTALL_PATH[sdk=macosx*]" = /usr/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_NAME = security;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4C541F8A0F250BF500E508AE /* Release */ = {
+               792EFFDF0CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = phase2;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/iOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               "INSTALL_PATH[sdk=macosx*]" = /usr/bin;
+                               OTHER_LDFLAGS = (
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_NAME = security;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4C541F980F250C3000E508AE /* Debug */ = {
+               792EFFE00CBBF878007C00A0 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = phase1;
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "$(inherited)",
+                                       "SEC_IOS_ON_OSX=1",
+                               );
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = sslViewer;
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4C541F9B0F250C3000E508AE /* Release */ = {
+               792EFFE10CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = phase1;
+                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "$(inherited)",
+                                       "SEC_IOS_ON_OSX=1",
+                               );
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               PRODUCT_NAME = sslViewer;
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               4C711D7413AFCD0900FE865D /* Debug */ = {
+               792EFFE20CBBF878007C00A0 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
-                               COMBINE_HIDPI_IMAGES = YES;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               HEADER_SEARCH_PATHS = (
+                                       "SECD_SERVER=1",

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)/OSX/regressions",

                                );
                                );

-                               INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";
+                               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 = (
                                        "$(inherited)",
                                OTHER_LDFLAGS = (
                                        "$(inherited)",

-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "-ObjC",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "$(inherited)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
-                                       "-lSecureKeyVaultForiapd",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
-                               PRODUCT_NAME = SecurityDevTests;
+                               PRODUCT_NAME = securityd;
+                               REEXPORTED_LIBRARY_NAMES = "";

                                STRIP_STYLE = debugging;
                                STRIP_STYLE = debugging;

+                               USE_HEADERMAP = NO;
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4C711D7513AFCD0900FE865D /* Release */ = {
+               792EFFE30CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
-                               COMBINE_HIDPI_IMAGES = YES;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               HEADER_SEARCH_PATHS = (
+                                       "SECD_SERVER=1",

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)/OSX/regressions",

                                );
                                );

-                               INFOPLIST_FILE = "SecurityTests/SecurityDevTests-Info.plist";
+                               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 = (
                                        "$(inherited)",
                                OTHER_LDFLAGS = (
                                        "$(inherited)",

-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "-ObjC",

                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",

-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
-                                       "-lSecureKeyVaultForiapd",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",

                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",

-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
-                               PRODUCT_NAME = SecurityDevTests;
-                               STRIP_STYLE = debugging;
-                       };
-                       name = Release;
-               };
-               4C9DE9D41181AC4900CF5C27 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                               );
-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                );

-                               PRODUCT_NAME = sslEcdsa;
+                               PRODUCT_NAME = securityd;
+                               REEXPORTED_LIBRARY_NAMES = "";
+                               STRIP_STYLE = debugging;
+                               USE_HEADERMAP = NO;
+                               WARNING_CFLAGS = "$(inherited)";
+                       };
+                       name = Release;
+               };
+               792EFFE60CBBF878007C00A0 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = world;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               4C9DE9D51181AC4900CF5C27 /* Release */ = {
+               792EFFE70CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               INSTALL_PATH = /usr/local/bin;
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                               );
-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                               );
-                               PRODUCT_NAME = sslEcdsa;
+                               PRODUCT_NAME = world;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               52D82BE916A621F80078DFE5 /* Debug */ = {
+               792EFFE80CBBF878007C00A0 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       baseConfigurationReference = EB2CA5561D2C30F700AB770F /* Security.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               APPLY_RULES_IN_COPY_FILES = YES;
+                               CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;

+                               CLANG_STATIC_ANALYZER_MODE = shallow;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_COMMA = YES;

                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;

+                               CLANG_WARN_INFINITE_RECURSION = YES;

                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;

+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
+                               CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;

                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = KVSKeychainSyncingProxy/cloudkeychain.entitlements.plist;
-                               COMBINE_HIDPI_IMAGES = YES;
+                               CODE_SIGN_IDENTITY = "-";

                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;

+                               DEAD_CODE_STRIPPING = YES;

                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
-                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = "";
-                               HEADER_SEARCH_PATHS = (
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle/CKBridge",

                                );
                                );

-                               INFOPLIST_FILE = "KVSKeychainSyncingProxy/CloudKeychainProxy-Info.plist";
-                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_RESOURCES_DIR)";
-                               MACH_O_TYPE = mh_execute;
+                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+                               GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+                               GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+                               GCC_WARN_MISSING_PARENTHESES = YES;
+                               GCC_WARN_SHADOW = YES;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNKNOWN_PRAGMAS = YES;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_LABEL = YES;
+                               GCC_WARN_UNUSED_VALUE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO;
+                               INSTALL_DAEMON_AGENT_DIR = "$(SYSTEM_LIBRARY_DIR)/LaunchDaemons";
+                               "INSTALL_DAEMON_AGENT_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/LaunchAgents";
+                               LLVM_LTO = YES;

                                ONLY_ACTIVE_ARCH = YES;
                                ONLY_ACTIVE_ARCH = YES;

-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-ObjC",
-                               );
-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = "-ObjC";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.cloudkeychainproxy3;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = NO;
+                               OTHER_LDFLAGS = "";
+                               RUN_CLANG_STATIC_ANALYZER = YES;
+                               SDKROOT = macosx.internal;
+                               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";
+                               SECURITY_FRAMEWORK_XPCSERVICES_DIR = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/XPCServices";
+                               "SECURITY_FRAMEWORK_XPCSERVICES_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/A/XPCServices";
+                               SERVICETYPE_USER_OR_SYSTEM = System;
+                               "SERVICETYPE_USER_OR_SYSTEM[sdk=macosx*]" = User;

                                STRIP_INSTALLED_PRODUCT = NO;
                                STRIP_INSTALLED_PRODUCT = NO;

-                               STRIP_STYLE = all;
-                               WRAPPER_EXTENSION = bundle;
+                               SUPPORTED_PLATFORMS = "bridgeos iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator";
+                               SUPPORTS_TEXT_BASED_API = YES;
+                               Sim_Name = "";
+                               "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               TARGETED_DEVICE_FAMILY = "1,2,3,4";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               52D82BEA16A621F80078DFE5 /* Release */ = {
+               792EFFE90CBBF878007C00A0 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       baseConfigurationReference = EB2CA5561D2C30F700AB770F /* Security.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               APPLY_RULES_IN_COPY_FILES = YES;
+                               CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;

+                               CLANG_STATIC_ANALYZER_MODE = shallow;
+                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_COMMA = YES;

                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;

+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;

+                               CLANG_WARN_INFINITE_RECURSION = YES;

                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;

+                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+                               CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
+                               CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;

                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = KVSKeychainSyncingProxy/cloudkeychain.entitlements.plist;
-                               COMBINE_HIDPI_IMAGES = YES;
+                               CODE_SIGN_IDENTITY = "-";

                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;

+                               DEAD_CODE_STRIPPING = YES;

                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = "";
-                               HEADER_SEARCH_PATHS = (
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = s;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NDEBUG=1",

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "$(PROJECT_DIR)/OSX/sec/SOSCircle/CKBridge",
-                               );
-                               INFOPLIST_FILE = "KVSKeychainSyncingProxy/CloudKeychainProxy-Info.plist";
-                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_RESOURCES_DIR)";
-                               MACH_O_TYPE = mh_execute;
-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-ObjC",

                                );
                                );

-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*]" = "-ObjC";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.cloudkeychainproxy3;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = NO;
-                               STRIP_STYLE = all;
-                               VALIDATE_PRODUCT = YES;
-                               WRAPPER_EXTENSION = bundle;
+                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
+                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
+                               GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+                               GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
+                               GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+                               GCC_WARN_MISSING_PARENTHESES = YES;
+                               GCC_WARN_SHADOW = YES;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNKNOWN_PRAGMAS = YES;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               GCC_WARN_UNUSED_LABEL = YES;
+                               GCC_WARN_UNUSED_VALUE = YES;
+                               GCC_WARN_UNUSED_VARIABLE = YES;
+                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO;
+                               INSTALL_DAEMON_AGENT_DIR = "$(SYSTEM_LIBRARY_DIR)/LaunchDaemons";
+                               "INSTALL_DAEMON_AGENT_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/LaunchAgents";
+                               LLVM_LTO = YES;
+                               OTHER_LDFLAGS = "";
+                               RUN_CLANG_STATIC_ANALYZER = YES;
+                               SDKROOT = macosx.internal;
+                               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";
+                               SECURITY_FRAMEWORK_XPCSERVICES_DIR = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/XPCServices";
+                               "SECURITY_FRAMEWORK_XPCSERVICES_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/A/XPCServices";
+                               SERVICETYPE_USER_OR_SYSTEM = System;
+                               "SERVICETYPE_USER_OR_SYSTEM[sdk=macosx*]" = User;
+                               SUPPORTED_PLATFORMS = "bridgeos iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator";
+                               SUPPORTS_TEXT_BASED_API = YES;
+                               SWIFT_COMPILATION_MODE = wholemodule;
+                               Sim_Name = "";
+                               "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
+                               TAPI_VERIFY_MODE = ErrorsAndWarnings;
+                               TARGETED_DEVICE_FAMILY = "1,2,3,4";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               5346480B17331E1200FE9172 /* Debug */ = {
+               ACBAF6DB1E9417F40007BA2F /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_MODULES = NO;
-                               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__DUPLICATE_METHOD_MATCH = YES;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_SUSPICIOUS_MOVES = YES;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "DEBUG=1",
+                                       COM_APPLE_SECURITY_SANE_INCLUDES,

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES;
-                               INFOPLIST_FILE = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Info.plist";
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Notification";
-                               OTHER_LDFLAGS = "$(AOSKIT_FRAMEWORK)";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
+                               MTL_ENABLE_DEBUG_INFO = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               WRAPPER_EXTENSION = bundle;
+                               RUN_CLANG_STATIC_ANALYZER = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               5346480C17331E1200FE9172 /* Release */ = {
+               ACBAF6DC1E9417F40007BA2F /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_MODULES = NO;
-                               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__DUPLICATE_METHOD_MATCH = YES;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               INFOPLIST_FILE = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Info.plist";
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Accounts/Notification";
-                               OTHER_LDFLAGS = "$(AOSKIT_FRAMEWORK)";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       COM_APPLE_SECURITY_SANE_INCLUDES,
+                                       "$(inherited)",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               VALIDATE_PRODUCT = YES;
-                               WRAPPER_EXTENSION = bundle;
+                               RUN_CLANG_STATIC_ANALYZER = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               5E10992A19A5E55800A60E2B /* Debug */ = {
+               BE197F4619116FD100BA91D1 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+                               AXLE_ENABLE_DEBUG_INFO = YES;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;

+                               CLANG_WARN_ASSIGN_ENUM = YES;

                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;


@@ -35994,37 +43482,46 @@
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                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;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(TARGET_NAME)/entitlements.plist";
+                               "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";

                                COMBINE_HIDPI_IMAGES = YES;
                                COMBINE_HIDPI_IMAGES = YES;

-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_DYNAMIC_NO_PIC = NO;

+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                        "$(inherited)",
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                        "$(inherited)",
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;

+                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               INFOPLIST_FILE = ISACLProtectedItems/Info.plist;
-                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               INFOPLIST_FILE = "$(TARGET_NAME)/$(TARGET_NAME)-Info.plist";
+                               "INSTALL_PATH[sdk=embedded*]" = "$(LOCAL_APPS_DIR)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                               );

                                ONLY_ACTIVE_ARCH = YES;
                                ONLY_ACTIVE_ARCH = YES;

-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.securityservices.${PRODUCT_NAME:rfc1034identifier}";
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               WRAPPER_EXTENSION = bundle;
+                               VALIDATE_PRODUCT = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               5E10992B19A5E55800A60E2B /* Release */ = {
+               BE197F4719116FD100BA91D1 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+                               AXLE_ENABLE_DEBUG_INFO = NO;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;

+                               CLANG_WARN_ASSIGN_ENUM = YES;

                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;


@@ -36032,182 +43529,248 @@
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                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;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

+                               CODE_SIGN_ENTITLEMENTS = "$(TARGET_NAME)/entitlements.plist";
+                               "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";

                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;

-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
+                               GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";
+                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               INFOPLIST_FILE = ISACLProtectedItems/Info.plist;
-                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.securityservices.${PRODUCT_NAME:rfc1034identifier}";
+                               INFOPLIST_FILE = "$(TARGET_NAME)/$(TARGET_NAME)-Info.plist";
+                               "INSTALL_PATH[sdk=embedded*]" = "$(LOCAL_APPS_DIR)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${PRODUCT_NAME:rfc1034identifier}";

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               VALIDATE_PRODUCT = YES;
-                               WRAPPER_EXTENSION = bundle;
+                               VALIDATE_PRODUCT = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               5EBE247E1B00CCAE0007DB0E /* Debug */ = {
+               BE442BBF18B7FDB800F24DAE /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = "secacltests/secacltests-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib",
-                               );
-                               OTHER_LDFLAGS = (
-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(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)",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
+                               CODE_SIGN_ENTITLEMENTS = "OSX/sec/SharedWebCredential/swcagent-entitlements.plist";
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/";
+                               OTHER_LDFLAGS = "";
+                               "OTHER_LDFLAGS[sdk=embedded*][arch=*]" = (
+                                       "$(OTHER_LDFLAGS)",
+                                       "-framework",
+                                       SpringBoardServices,

                                        "-framework",
                                        "-framework",

-                                       CrashReporterSupport,
+                                       ManagedConfiguration,

                                );
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = swcagent;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               5EBE247F1B00CCAE0007DB0E /* Release */ = {
+               BE442BC018B7FDB800F24DAE /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = "secacltests/secacltests-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib",
-                               );
-                               OTHER_LDFLAGS = (
-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(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)",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
+                               CODE_SIGN_ENTITLEMENTS = "OSX/sec/SharedWebCredential/swcagent-entitlements.plist";
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/";
+                               OTHER_LDFLAGS = "";
+                               "OTHER_LDFLAGS[sdk=embedded*][arch=*]" = (
+                                       "$(OTHER_LDFLAGS)",
+                                       "-framework",
+                                       SpringBoardServices,

                                        "-framework",
                                        "-framework",

-                                       CrashReporterSupport,
+                                       ManagedConfiguration,

                                );
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_NAME = swcagent;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6C4605B61F882B9B001421B6 /* Debug */ = {
+               BEAA0037202A832500E51F45 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/TrustedPeersHelper/TrustedPeersHelper-entitlements.plist";
+                               DEFINES_MODULE = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
+                               INFOPLIST_FILE = keychain/TrustedPeersHelper/Info.plist;
+                               INFOPLIST_PREPROCESS = YES;
+                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_XPCSERVICES_DIR)";

                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (

-                                       "-ObjC",
-                                       "$(AOSKIT_FRAMEWORK)",
-                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "-framework",
+                                       Security,

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelper;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/TrustedPeersHelper/TrustedPeersHelper-Bridging-Header.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6C4605B71F882B9B001421B6 /* Release */ = {
+               BEAA0038202A832500E51F45 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
+                               CLANG_WARN_STRICT_PROTOTYPES = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/TrustedPeersHelper/TrustedPeersHelper-entitlements.plist";
+                               DEFINES_MODULE = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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/;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
+                               INFOPLIST_FILE = keychain/TrustedPeersHelper/Info.plist;
+                               INFOPLIST_PREPROCESS = YES;
+                               INSTALL_PATH = "$(SECURITY_FRAMEWORK_XPCSERVICES_DIR)";

                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (

-                                       "-ObjC",
-                                       "$(AOSKIT_FRAMEWORK)",
-                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "-framework",
+                                       Security,
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelper;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/TrustedPeersHelper/TrustedPeersHelper-Bridging-Header.h";
+                       };
+                       name = Release;
+               };
+               BEAA0042202B728B00E51F45 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               BEAA0043202B728B00E51F45 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               BECFA43220F91AFE00B11002 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               BECFA43320F91AFE00B11002 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               BED208DB1EDF950E00753952 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/manifeststresstest/manifeststresstest.entitlements;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               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;
+               };
+               BED208DC1EDF950E00753952 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/manifeststresstest/manifeststresstest.entitlements;
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTHER_LDFLAGS[sdk=embedded]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,
+                               );
+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-laks",
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       IOKit,

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainAnalyticsTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                };

-               6C98085F1E788AEB00E70590 /* Debug */ = {
+               BED987DC2099145400607A5F /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",

-                                       "NO_LIBTRUSTD=1",
+                                       "DEBUG=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               INFOPLIST_FILE = keychain/TrustedPeersHelperUnitTests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",


@@ -36215,57 +43778,50 @@
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(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)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                        "-framework",
                                        "-framework",

-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_mac.app/Contents/MacOS/KeychainEntitledTestApp_mac";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/TrustedPeersHelperUnitTests/TrustedPeersHelperUnitTests-BridgingHeader.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6C9808601E788AEB00E70590 /* Release */ = {
+               BED987DD2099145400607A5F /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",

-                                       "NO_LIBTRUSTD=1",
+                                       "NDEBUG=1",

                                        "$(inherited)",
                                );
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = NO;
+                               INFOPLIST_FILE = keychain/TrustedPeersHelperUnitTests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",


@@ -36273,1406 +43829,947 @@
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CORECDP)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(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)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                        "-framework",
                                        "-framework",

-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_mac.app/Contents/MacOS/KeychainEntitledTestApp_mac";
-                               VALIDATE_PRODUCT = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/TrustedPeersHelperUnitTests/TrustedPeersHelperUnitTests-BridgingHeader.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6C98089B1E788AFD00E70590 /* Debug */ = {
+               BEF88C391EAFFC4000357577 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
+                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               FRAMEWORK_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",

                                );
                                );

+                               FRAMEWORK_VERSION = A;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               INFOPLIST_FILE = keychain/trust/TrustedPeers/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                                OTHER_LDFLAGS = (
                                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)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(inherited)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "$(OTHER_LDFLAGS_UPWARD_SECURITYFOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(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)",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_ios.app/KeychainEntitledTestApp_ios";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeers;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               TAPI_VERIFY_MODE = Pedantic;
+                               VERSION_INFO_PREFIX = "";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6C98089C1E788AFD00E70590 /* Release */ = {
+               BEF88C3A1EAFFC4000357577 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
+                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               FRAMEWORK_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",

                                );
                                );

+                               FRAMEWORK_VERSION = A;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = NO;
+                               INFOPLIST_FILE = keychain/trust/TrustedPeers/Info.plist;
+                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(inherited)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "$(OTHER_LDFLAGS_UPWARD_SECURITYFOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(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_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)",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeers;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               TAPI_VERIFY_MODE = Pedantic;
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Release;
+               };
+               BEF88C3B1EAFFC4000357577 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               HEADER_SEARCH_PATHS = (
+                                       keychain/trust/TrustedPeers/,
+                                       "$(inherited)",

                                );
                                );

-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_ios.app/KeychainEntitledTestApp_ios";
-                               VALIDATE_PRODUCT = YES;
+                               INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               BEF88C3C1EAFFC4000357577 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               HEADER_SEARCH_PATHS = (
+                                       keychain/trust/TrustedPeers/,
+                                       "$(inherited)",
+                               );
+                               INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6C9AA7A31F7C1D9000D08296 /* Debug */ = {
+               D41257D71E9410A300781F23 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CODE_SIGN_ENTITLEMENTS = trust/trustd/iOS/entitlements.plist;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_NAME = trustd;
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Debug;
+               };
+               D41257D81E9410A300781F23 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CODE_SIGN_ENTITLEMENTS = trust/trustd/iOS/entitlements.plist;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_NAME = trustd;
+                               STRIP_STYLE = debugging;
+                       };
+                       name = Release;
+               };
+               D41AD42F1B967169008C7270 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               D41AD4301B967169008C7270 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               D41AD4331B96717A008C7270 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               D41AD4341B96717A008C7270 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               D42C839A21159147008D3D83 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supdctl/supdctl-Entitlements.plist";
-                               CODE_SIGN_STYLE = Automatic;
+                               EXECUTABLE_PREFIX = lib;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /usr/local/bin;
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = YES;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6C9AA7A41F7C1D9000D08296 /* Release */ = {
+               D42C839B21159147008D3D83 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                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;
                                ENABLE_NS_ASSERTIONS = NO;

+                               EXECUTABLE_PREFIX = lib;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INSTALL_PATH = /usr/local/bin;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6CAA8D251F842FB4007B6E03 /* Debug */ = {
+               D44D1F672115893000E76E1A /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       buildSettings = {
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                       };
+                       name = Debug;
+               };
+               D44D1F682115893000E76E1A /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       buildSettings = {
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                       };
+                       name = Release;
+               };
+               D453A4BE2122236D00850A26 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/supd/securityuploadd-Entitlements.plist";
-                               CODE_SIGN_STYLE = Automatic;
-                               GCC_DYNAMIC_NO_PIC = NO;
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "IS_TRUSTTESTS=1",
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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;
+                               INFOPLIST_FILE = tests/TrustTests/Info.plist;
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(AOSKIT_FRAMEWORK)",
-                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
+                               PRODUCT_NAME = TrustTests;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6CAA8D261F842FB4007B6E03 /* Release */ = {
+               D453A4BF2122236D00850A26 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_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_OBJC_ROOT_CLASS = YES_ERROR;

-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                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)/../../AppleInternal/Library/Frameworks",
+                               );
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "IS_TRUSTTESTS=1",
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                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";
+                               INFOPLIST_FILE = tests/TrustTests/Info.plist;
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;

                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (

-                                       "$(AOSKIT_FRAMEWORK)",
-                                       "$(OTHER_LDFLAGS_CRASHREPORTER)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                );

-                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
+                               PRODUCT_NAME = TrustTests;
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6CCDF7891E3C25FB003F2555 /* Debug */ = {
+               D458C4F5214E1DE10043D982 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
+                               CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
+                               CODE_SIGN_STYLE = Automatic;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;

-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PLATFORM_DIR)/Developer/Library/Frameworks",
-                                       "$(PLATFORM_DIR)/Developer/AppleInternal/Library/Frameworks",
-                               );
-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               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";
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTestsRunner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = iphoneos.internal;
+                               VALIDATE_PRODUCT = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6CCDF78A1E3C25FB003F2555 /* Release */ = {
+               D458C4F6214E1DE10043D982 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

+                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               COPY_PHASE_STRIP = NO;
+                               CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
+                               CODE_SIGN_STYLE = Automatic;

                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               FRAMEWORK_SEARCH_PATHS = (
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
+                               LD_RUNPATH_SEARCH_PATHS = (

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "$(PLATFORM_DIR)/Developer/Library/Frameworks",
-                                       "$(PLATFORM_DIR)/Developer/AppleInternal/Library/Frameworks",
+                                       "@executable_path/Frameworks",
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,

                                );
                                );

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               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";

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTestsRunner;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SDKROOT = iphoneos.internal;
+                               VALIDATE_PRODUCT = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6CF4A0C51E45488B00ECD7B5 /* Debug */ = {
+               D458C50E214E20540043D982 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               COMBINE_HIDPI_IMAGES = YES;
+                               CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
+                               CODE_SIGN_STYLE = Automatic;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               ENABLE_TESTING_SEARCH_PATHS = YES;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
+                               INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;

                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-mac";
-                               PRODUCT_NAME = KeychainEntitledTestApp;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6CF4A0C61E45488B00ECD7B5 /* Release */ = {
+               D458C50F214E20540043D982 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
+                               CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
+                               CODE_SIGN_STYLE = Automatic;

                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               ENABLE_TESTING_SEARCH_PATHS = YES;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
+                               INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;

                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-mac";
-                               PRODUCT_NAME = KeychainEntitledTestApp;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               6CF4A0F51E4549F300ECD7B5 /* Debug */ = {
+               D4707A0B21136E6A005BCFDA /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                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;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "IS_TRUSTTESTS=1",
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = KeychainEntitledTestApp_ios/Info.plist;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-ios";
-                               PRODUCT_NAME = KeychainEntitledTestApp;
-                               VALIDATE_PRODUCT = NO;
+                               INFOPLIST_FILE = tests/TrustTests/Info.plist;
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_OCMOCK)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
+                               PRODUCT_NAME = TrustTests;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               6CF4A0F61E4549F300ECD7B5 /* Release */ = {
+               D4707A0C21136E6A005BCFDA /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

                                CLANG_ANALYZER_NONNULL = YES;
                                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;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "IS_TRUSTTESTS=1",
+                                       "LIBTRUSTD=1",
+                                       "$(inherited)",
+                               );

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               INFOPLIST_FILE = KeychainEntitledTestApp_ios/Info.plist;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+                               INFOPLIST_FILE = tests/TrustTests/Info.plist;
+                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security/;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-ios";
-                               PRODUCT_NAME = KeychainEntitledTestApp;
-                               VALIDATE_PRODUCT = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOBILEASSET)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_OCMOCK)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
+                               PRODUCT_NAME = TrustTests;
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               D477EE5E21ED476D00C9AAFF /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               D477EE5F21ED476D00C9AAFF /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               7913B20D0D172B3900601FE9 /* Debug */ = {
+               D477EE6221ED477C00C9AAFF /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslServer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                               );
-                               PRODUCT_NAME = sslServer;
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               7913B2100D172B3900601FE9 /* Release */ = {
+               D477EE6321ED477C00C9AAFF /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslServer-entitlements.plist";
-                               INSTALL_PATH = /usr/local/bin;
-                               OTHER_LDFLAGS = "";
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                               );
-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*][arch=*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                               );
-                               PRODUCT_NAME = sslServer;
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFDC0CBBF878007C00A0 /* Debug */ = {
+               D477EE6621ED479500C9AAFF /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               COMBINE_HIDPI_IMAGES = YES;
-                               DEAD_CODE_STRIPPING = YES;
-                               DEFINES_MODULE = YES;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-                               EXPORTED_SYMBOLS_FILE = "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp";
-                               FRAMEWORK_VERSION = B;
-                               INFOPLIST_FILE = "Security-Info.plist";
+                               CODE_SIGN_STYLE = Automatic;

                                INSTALLHDRS_SCRIPT_PHASE = YES;
                                INSTALLHDRS_SCRIPT_PHASE = YES;

-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               IS_ZIPPERED = YES;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib/security_libDER",
-                               );
-                               MODULEMAP_FILE = Modules/Security.iOS.modulemap;
-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-Wl,-upward_framework,Foundation",
-                                       "$(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;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFDD0CBBF878007C00A0 /* Release */ = {
+               D477EE6721ED479500C9AAFF /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               COMBINE_HIDPI_IMAGES = YES;
-                               DEAD_CODE_STRIPPING = YES;
-                               DEFINES_MODULE = YES;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-                               EXPORTED_SYMBOLS_FILE = "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp";
-                               FRAMEWORK_VERSION = B;
-                               INFOPLIST_FILE = "Security-Info.plist";
+                               CODE_SIGN_STYLE = Automatic;

                                INSTALLHDRS_SCRIPT_PHASE = YES;
                                INSTALLHDRS_SCRIPT_PHASE = YES;

-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               IS_ZIPPERED = YES;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib/security_libDER",
-                               );
-                               MODULEMAP_FILE = Modules/Security.iOS.modulemap;
-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-Wl,-upward_framework,Foundation",
-                                       "$(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;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFDE0CBBF878007C00A0 /* Debug */ = {
+               D477EE6A21ED47C600C9AAFF /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = SecurityTool/entitlements.plist;
-                               INSTALL_PATH = /usr/local/bin;
-                               "INSTALL_PATH[sdk=macosx*]" = /usr/bin;
-                               OTHER_LDFLAGS = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               PRODUCT_NAME = security;
-                               STRIP_STYLE = debugging;
-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFDF0CBBF878007C00A0 /* Release */ = {
+               D477EE6B21ED47C600C9AAFF /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = SecurityTool/entitlements.plist;
-                               INSTALL_PATH = /usr/local/bin;
-                               "INSTALL_PATH[sdk=macosx*]" = /usr/bin;
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "-framework",
-                                       IOKit,
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embeddedsimulator*][arch=*]" = (
-                                       "-lsqlite3",
-                                       "-framework",
-                                       CFNetwork,
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               PRODUCT_NAME = security;
-                               STRIP_STYLE = debugging;
-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFE00CBBF878007C00A0 /* Debug */ = {
+               D477EE6E21ED47DB00C9AAFF /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(inherited)",
-                                       "SEC_IOS_ON_OSX=1",
-                               );
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INSTALL_PATH = /usr/local/bin;
-                               PRODUCT_NAME = sslViewer;
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFE10CBBF878007C00A0 /* Release */ = {
+               D477EE6F21ED47DB00C9AAFF /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "sslViewer/sslViewer-entitlements.plist";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "$(inherited)",
-                                       "SEC_IOS_ON_OSX=1",
-                               );
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INSTALL_PATH = /usr/local/bin;
-                               PRODUCT_NAME = sslViewer;
-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFE20CBBF878007C00A0 /* Debug */ = {
+               D4ADA31B1E2B41670031CEA3 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "SECD_SERVER=1",
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = "";
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=embedded]" = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "LIBTRUSTD=1",

                                );
                                );

-                               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_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-ObjC",
-                                       "-lSystem",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=embeddedsimulator*]" = (

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "-ObjC",
+                                       "LIBTRUSTD=1",

                                );
                                );

-                               PRODUCT_NAME = securityd;
-                               STRIP_STYLE = debugging;
-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "-Wno-error=modules-ambiguous-internal-linkage",
+                                       "SECITEM_SHIM_OSX=1",
+                                       "SEC_IOS_ON_OSX=1",
+                                       "LIBTRUSTD=1",

                                );
                                );

+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = "-ObjC";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFE30CBBF878007C00A0 /* Release */ = {
+               D4ADA31C1E2B41670031CEA3 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "SECD_SERVER=1",
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = "";
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=embedded]" = (

                                        "$(inherited)",
                                        "$(inherited)",

+                                       "LIBTRUSTD=1",

                                );
                                );

-                               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_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lSystem",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=embeddedsimulator*]" = (

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "-ObjC",
+                                       "NO_SERVER=1",
+                                       "LIBTRUSTD=1",

                                );
                                );

-                               PRODUCT_NAME = securityd;
-                               STRIP_STYLE = debugging;
-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (

                                        "$(inherited)",
                                        "$(inherited)",

-                                       "-Wno-error=modules-ambiguous-internal-linkage",
+                                       "SECITEM_SHIM_OSX=1",
+                                       "SEC_IOS_ON_OSX=1",
+                                       "LIBTRUSTD=1",

                                );
                                );

+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = "-ObjC";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFE60CBBF878007C00A0 /* Debug */ = {
+               D4D1D3FF21AD0B3F0012C66C /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = world;
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFE70CBBF878007C00A0 /* Release */ = {
+               D4D1D40021AD0B3F0012C66C /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               PRODUCT_NAME = world;
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               792EFFE80CBBF878007C00A0 /* Debug */ = {
+               D4D1D40421AD0B4B0012C66C /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = EB2CA5561D2C30F700AB770F /* Security.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               APPLY_RULES_IN_COPY_FILES = YES;
-                               CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_STATIC_ANALYZER_MODE = shallow;
-                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_COMMA = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-                               CLANG_WARN_STRICT_PROTOTYPES = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-                               CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "-";
-                               COPY_PHASE_STRIP = NO;
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               ENABLE_TESTABILITY = YES;
-                               EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
-                               GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-                               GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-                               GCC_WARN_MISSING_PARENTHESES = YES;
-                               GCC_WARN_SHADOW = YES;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNKNOWN_PRAGMAS = YES;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_LABEL = YES;
-                               GCC_WARN_UNUSED_VALUE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO;
-                               INSTALL_DAEMON_AGENT_DIR = "$(SYSTEM_LIBRARY_DIR)/LaunchDaemons";
-                               "INSTALL_DAEMON_AGENT_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/LaunchAgents";
-                               LLVM_LTO = YES_THIN;
-                               ONLY_ACTIVE_ARCH = YES;
-                               OTHER_LDFLAGS = "";
-                               RUN_CLANG_STATIC_ANALYZER = YES;
-                               SDKROOT = macosx.internal;
-                               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";
-                               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";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               792EFFE90CBBF878007C00A0 /* Release */ = {
+               D4D1D40521AD0B4B0012C66C /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = EB2CA5561D2C30F700AB770F /* Security.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               APPLY_RULES_IN_COPY_FILES = YES;
-                               CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "c++14";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_STATIC_ANALYZER_MODE = shallow;
-                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_COMMA = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
-                               CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-                               CLANG_WARN_EMPTY_BODY = YES;
-                               CLANG_WARN_ENUM_CONVERSION = YES;
-                               CLANG_WARN_INFINITE_RECURSION = YES;
-                               CLANG_WARN_INT_CONVERSION = YES;
-                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
-                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-                               CLANG_WARN_STRICT_PROTOTYPES = YES;
-                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
-                               CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-                               CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_IDENTITY = "-";
-                               COPY_PHASE_STRIP = NO;
-                               DEAD_CODE_STRIPPING = YES;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NDEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-                               GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES;
-                               GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
-                               GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-                               GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-                               GCC_WARN_MISSING_PARENTHESES = YES;
-                               GCC_WARN_SHADOW = YES;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               GCC_WARN_UNKNOWN_PRAGMAS = YES;
-                               GCC_WARN_UNUSED_FUNCTION = YES;
-                               GCC_WARN_UNUSED_LABEL = YES;
-                               GCC_WARN_UNUSED_VALUE = YES;
-                               GCC_WARN_UNUSED_VARIABLE = YES;
-                               HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO;
-                               INSTALL_DAEMON_AGENT_DIR = "$(SYSTEM_LIBRARY_DIR)/LaunchDaemons";
-                               "INSTALL_DAEMON_AGENT_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/LaunchAgents";
-                               LLVM_LTO = YES;
-                               OTHER_LDFLAGS = "";
-                               RUN_CLANG_STATIC_ANALYZER = YES;
-                               SDKROOT = macosx.internal;
-                               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";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               D4D1D40B21ADC9720012C66C /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               D4D1D40C21ADC9720012C66C /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               ACBAF6DB1E9417F40007BA2F /* Debug */ = {
+               D4D1FDDE21165F8B003538E2 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       COM_APPLE_SECURITY_SANE_INCLUDES,
-                                       "$(inherited)",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               RUN_CLANG_STATIC_ANALYZER = NO;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               ACBAF6DC1E9417F40007BA2F /* Release */ = {
+               D4D1FDDF21165F8B003538E2 /* Release */ = {

                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;

                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       COM_APPLE_SECURITY_SANE_INCLUDES,
-                                       "$(inherited)",
-                               );
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;
+                       };
+                       name = Release;
+               };
+               D4F47B3A22270B6F003483E9 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               D4F47B3B22270B6F003483E9 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               RUN_CLANG_STATIC_ANALYZER = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               BE197F4619116FD100BA91D1 /* Debug */ = {
+               D4F47B3E22270B8A003483E9 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-                               AXLE_ENABLE_DEBUG_INFO = YES;
-                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_ASSIGN_ENUM = 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__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = "$(TARGET_NAME)/entitlements.plist";
-                               "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";
-                               COMBINE_HIDPI_IMAGES = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INFOPLIST_FILE = "$(TARGET_NAME)/$(TARGET_NAME)-Info.plist";
-                               "INSTALL_PATH[sdk=embedded*]" = "$(LOCAL_APPS_DIR)";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-                               ONLY_ACTIVE_ARCH = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${PRODUCT_NAME:rfc1034identifier}";
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               VALIDATE_PRODUCT = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               BE197F4719116FD100BA91D1 /* Release */ = {
+               D4F47B3F22270B8A003483E9 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-                               ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-                               AXLE_ENABLE_DEBUG_INFO = NO;
-                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_ASSIGN_ENUM = 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__DUPLICATE_METHOD_MATCH = YES;
-                               CODE_SIGN_ENTITLEMENTS = "$(TARGET_NAME)/entitlements.plist";
-                               "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";
-                               COMBINE_HIDPI_IMAGES = YES;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INFOPLIST_FILE = "$(TARGET_NAME)/$(TARGET_NAME)-Info.plist";
-                               "INSTALL_PATH[sdk=embedded*]" = "$(LOCAL_APPS_DIR)";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.${PRODUCT_NAME:rfc1034identifier}";
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               VALIDATE_PRODUCT = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               BE442BBF18B7FDB800F24DAE /* Debug */ = {
+               D4F47B4222270B97003483E9 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "OSX/sec/SharedWebCredential/swcagent-entitlements.plist";
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/";
-                               OTHER_LDFLAGS = "";
-                               "OTHER_LDFLAGS[sdk=embedded*][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       SpringBoardServices,
-                                       "-framework",
-                                       ManagedConfiguration,
-                               );
-                               PRODUCT_NAME = swcagent;
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               BE442BC018B7FDB800F24DAE /* Release */ = {
+               D4F47B4322270B97003483E9 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               CODE_SIGN_ENTITLEMENTS = "OSX/sec/SharedWebCredential/swcagent-entitlements.plist";
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/";
-                               OTHER_LDFLAGS = "";
-                               "OTHER_LDFLAGS[sdk=embedded*][arch=*]" = (
-                                       "$(OTHER_LDFLAGS)",
-                                       "-framework",
-                                       SpringBoardServices,
-                                       "-framework",
-                                       ManagedConfiguration,
-                               );
-                               PRODUCT_NAME = swcagent;
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               BED208DB1EDF950E00753952 /* Debug */ = {
+               D4F56B87217FA32000FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/manifeststresstest/manifeststresstest.entitlements;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               BED208DC1EDF950E00753952 /* Release */ = {
+               D4F56B88217FA32000FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/manifeststresstest/manifeststresstest.entitlements;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
-                               OTHER_LDFLAGS = (
-                                       "-framework",
-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
-                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               BEF88C391EAFFC4000357577 /* Debug */ = {
+               D4F56B8F217FA3F800FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-                               CURRENT_PROJECT_VERSION = 1;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               DYLIB_INSTALL_NAME_BASE = "@rpath";
-                               FRAMEWORK_VERSION = A;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INFOPLIST_FILE = keychain/trust/TrustedPeers/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-Wl,-upward_framework,Foundation",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                               );
-                               "OTHER_LDFLAGS[sdk=*simulator*]" = "-Wl,-upward_framework,Foundation";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeers;
-                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-                               SKIP_INSTALL = YES;
-                               VERSION_INFO_PREFIX = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               BEF88C3A1EAFFC4000357577 /* Release */ = {
+               D4F56B90217FA3F800FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-                               CURRENT_PROJECT_VERSION = 1;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               DYLIB_INSTALL_NAME_BASE = "@rpath";
-                               FRAMEWORK_VERSION = A;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INFOPLIST_FILE = keychain/trust/TrustedPeers/Info.plist;
-                               INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks";
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-                               OTHER_LDFLAGS = (
-                                       "-laks",
-                                       "-Wl,-upward_framework,Foundation",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                               );
-                               "OTHER_LDFLAGS[sdk=*simulator*]" = "-Wl,-upward_framework,Foundation";
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeers;
-                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-                               SKIP_INSTALL = YES;
-                               VERSION_INFO_PREFIX = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               BEF88C3B1EAFFC4000357577 /* Debug */ = {
+               D4F56B93217FA40800FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               BEF88C3C1EAFFC4000357577 /* Release */ = {
+               D4F56B94217FA40800FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               INFOPLIST_FILE = keychain/trust/TrustedPeersTests/Info.plist;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersTests;
+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };

-               D41257D71E9410A300781F23 /* Debug */ = {
+               D4F56BC421813EC900FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CODE_SIGN_ENTITLEMENTS = OSX/trustd/iOS/entitlements.plist;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               INSTALL_PATH = /usr/libexec;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEASSET)";
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
-                                       "-lImg4Decode",
-                               );
-                               PRODUCT_NAME = trustd;
-                               STRIP_STYLE = debugging;
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               D41257D81E9410A300781F23 /* Release */ = {
+               D4F56BC521813EC900FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CODE_SIGN_ENTITLEMENTS = OSX/trustd/iOS/entitlements.plist;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               INSTALL_PATH = /usr/libexec;
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/usr/local/lib",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEASSET)";
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
-                                       "-lImg4Decode",
-                               );
-                               PRODUCT_NAME = trustd;
-                               STRIP_STYLE = debugging;
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               D41AD42F1B967169008C7270 /* Debug */ = {
+               D4F56BC821813ECF00FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               D41AD4301B967169008C7270 /* Release */ = {
+               D4F56BC921813ECF00FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };

-               D41AD4331B96717A008C7270 /* Debug */ = {
+               D4F56BCC21813EDC00FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               D41AD4341B96717A008C7270 /* Release */ = {
+               D4F56BCD21813EDC00FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };

-               D4ADA31B1E2B41670031CEA3 /* Debug */ = {
+               D4F56BD021813EE800FCA6B7 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               EXECUTABLE_PREFIX = "";
-                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
-                                       "$(inherited)",
-                                       "SECITEM_SHIM_OSX=1",
-                                       "SEC_IOS_ON_OSX=1",
-                                       "TRUSTD_SERVER=1",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               OTHER_LDFLAGS = "-ObjC";
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               D4ADA31C1E2B41670031CEA3 /* Release */ = {
+               D4F56BD121813EE800FCA6B7 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               EXECUTABLE_PREFIX = "";
-                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
-                                       "$(inherited)",
-                                       "TRUSTD_SERVER=1",
-                                       "SECITEM_SHIM_OSX=1",
-                                       "SEC_IOS_ON_OSX=1",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               OTHER_LDFLAGS = "-ObjC";
+                               CODE_SIGN_STYLE = Automatic;
+                               INSTALLHDRS_SCRIPT_PHASE = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -37698,11 +44795,60 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               DA41FE122241ADC000838FB3 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = keychain/otpaird/otpaird.iphoneos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*]" = keychain/otpaird/otpaird.iphoneos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=watchos*]" = keychain/otpaird/otpaird.watchos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=watchsimulator*]" = keychain/otpaird/otpaird.watchos.entitlements;
+                               CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
+                               INFOPLIST_FILE = keychain/otpaird/Info.plist;
+                               INSTALL_PATH = /usr/libexec;
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=iphoneos*]" = com.apple.security.otpaird.iphoneos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=iphonesimulator*]" = com.apple.security.otpaird.iphoneos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=watchos*]" = com.apple.security.otpaird.watchos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=watchsimulator*]" = com.apple.security.otpaird.watchos.plist;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.otpaird;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               DA41FE132241ADC000838FB3 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               "CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*]" = keychain/otpaird/otpaird.iphoneos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*]" = keychain/otpaird/otpaird.iphoneos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=watchos*]" = keychain/otpaird/otpaird.watchos.entitlements;
+                               "CODE_SIGN_ENTITLEMENTS[sdk=watchsimulator*]" = keychain/otpaird/otpaird.watchos.entitlements;
+                               CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
+                               INFOPLIST_FILE = keychain/otpaird/Info.plist;
+                               INSTALL_PATH = /usr/libexec;
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "-framework",
+                                       Security,
+                               );
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=iphoneos*]" = com.apple.security.otpaird.iphoneos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=iphonesimulator*]" = com.apple.security.otpaird.iphoneos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=watchos*]" = com.apple.security.otpaird.watchos.plist;
+                               "OTPAIRD_LAUNCHD_PLIST[sdk=watchsimulator*]" = com.apple.security.otpaird.watchos.plist;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.otpaird;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };

                DAE40BCC20CF3E46002D5674 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                DAE40BCC20CF3E46002D5674 /* 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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -37718,7 +44864,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -37740,7 +44885,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -37757,7 +44901,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -37775,7 +44918,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -37790,7 +44932,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -37805,7 +44946,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -37820,7 +44960,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -37844,13 +44983,88 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               DC05037B21409A4100A8EDB7 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               FRAMEWORK_VERSION = A;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = OCMockUmbrella/Info.plist;
+                               INSTALL_PATH = /AppleInternal/CoreOS/BATS/unit_tests/Frameworks;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.OCMockUmbrella;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Debug;
+               };
+               DC05037C21409A4100A8EDB7 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
+                               FRAMEWORK_VERSION = A;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = OCMockUmbrella/Info.plist;
+                               INSTALL_PATH = /AppleInternal/CoreOS/BATS/unit_tests/Frameworks;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.OCMockUmbrella;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Release;
+               };

                DC0BC55E1D8B6D2E00070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                DC0BC55E1D8B6D2E00070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = 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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -37879,7 +45093,6 @@
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = 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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -37910,7 +45123,6 @@
                                CLANG_ENABLE_OBJC_ARC = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_OBJC_ARC = NO;
                                CLANG_ENABLE_OBJC_WEAK = 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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -37940,7 +45152,6 @@
                                CLANG_ENABLE_OBJC_ARC = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_OBJC_ARC = NO;
                                CLANG_ENABLE_OBJC_WEAK = 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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -37966,7 +45177,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -37980,7 +45190,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -37994,7 +45203,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38007,7 +45215,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38021,7 +45228,6 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -38041,7 +45247,6 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -38060,7 +45265,6 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -38080,7 +45284,6 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -38097,7 +45300,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -38108,7 +45310,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -38120,7 +45321,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -38137,7 +45337,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -38154,7 +45353,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (


@@ -38171,7 +45369,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (


@@ -38188,7 +45385,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38201,7 +45397,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38214,10 +45409,9 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };


@@ -38228,10 +45422,9 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };


@@ -38242,7 +45435,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38255,7 +45447,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38268,7 +45459,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -38283,7 +45473,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -38298,7 +45487,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38311,7 +45499,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38324,7 +45511,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38337,7 +45523,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38347,7 +45532,6 @@
                };
                DC0BC9CD1D8B824700070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                DC0BC9CD1D8B824700070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_ENUM_CONVERSION = NO;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_ENUM_CONVERSION = NO;


@@ -38372,7 +45556,6 @@
                };
                DC0BC9CE1D8B824700070CB0 /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DC0BC9CE1D8B824700070CB0 /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_ENUM_CONVERSION = NO;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_ENUM_CONVERSION = NO;


@@ -38408,7 +45591,6 @@
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",

-                                       "-Wno-int-to-void-pointer-cast",

                                        "-Wno-sign-compare",
                                );
                        };
                                        "-Wno-sign-compare",
                                );
                        };


@@ -38427,7 +45609,6 @@
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",

-                                       "-Wno-int-to-void-pointer-cast",

                                        "-Wno-sign-compare",
                                );
                        };
                                        "-Wno-sign-compare",
                                );
                        };


@@ -38438,10 +45619,8 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu11;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        COM_APPLE_SECURITY_SANE_INCLUDES,
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        COM_APPLE_SECURITY_SANE_INCLUDES,
                                        "$(inherited)",


@@ -38457,10 +45636,8 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu11;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        COM_APPLE_SECURITY_SANE_INCLUDES,
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        COM_APPLE_SECURITY_SANE_INCLUDES,
                                        "$(inherited)",


@@ -38476,7 +45653,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -38489,7 +45665,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -38547,7 +45722,6 @@
                };
                DC0BCC341D8C684F00070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                DC0BCC341D8C684F00070CB0 /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -38566,21 +45740,17 @@
                                GCC_WARN_SHADOW = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_SHADOW = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                STRIP_INSTALLED_PRODUCT = NO;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                STRIP_INSTALLED_PRODUCT = NO;

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-unused-function",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                DC0BCC351D8C684F00070CB0 /* Release */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Debug;
                };
                DC0BCC351D8C684F00070CB0 /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -38599,15 +45769,12 @@
                                GCC_WARN_SHADOW = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_SHADOW = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                STRIP_INSTALLED_PRODUCT = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                STRIP_INSTALLED_PRODUCT = NO;

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-unused-function",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -38628,14 +45795,13 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",

-                                       "-Wno-unused-function",

                                );
                        };
                        name = Debug;
                                );
                        };
                        name = Debug;


@@ -38657,18 +45823,91 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = YES;
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",

-                                       "-Wno-unused-function",

                                );
                        };
                        name = Release;
                };
                                );
                        };
                        name = Release;
                };

+               DC0EF8F4208697C700AB9E95 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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_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 = "keychain/tpctl/tpctl-entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/sbin;
+                               "INSTALL_PATH[sdk=embedded]" = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       SecurityFoundation,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/tpctl/tpctl-bridging-header.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                       };
+                       name = Debug;
+               };
+               DC0EF8F5208697C700AB9E95 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               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_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 = "keychain/tpctl/tpctl-entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = /usr/sbin;
+                               "INSTALL_PATH[sdk=embedded]" = /usr/local/bin;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "-framework",
+                                       Security,
+                                       "-framework",
+                                       SecurityFoundation,
+                               );
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SWIFT_COMPILATION_MODE = wholemodule;
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/tpctl/tpctl-bridging-header.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-O";
+                       };
+                       name = Release;
+               };

                DC17890E1D77980500B50D50 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC178BB11D77A5F500B50D50 /* security_framework_macos.xcconfig */;
                DC17890E1D77980500B50D50 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DC178BB11D77A5F500B50D50 /* security_framework_macos.xcconfig */;


@@ -38677,7 +45916,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -38695,8 +45933,18 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)/OSX/include/",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)//usr/local/lib/security_libDER",
+                               );
+                               MODULEMAP_PRIVATE_FILE = Modules/Security.macOS.private.modulemap;

                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (

+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(inherited)",
                                );
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(inherited)",
                                );


@@ -38714,7 +45962,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -38732,8 +45979,18 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(PROJECT_DIR)/OSX/include/",
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)//usr/local/lib/security_libDER",
+                               );
+                               MODULEMAP_PRIVATE_FILE = Modules/Security.macOS.private.modulemap;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (

+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(inherited)",
                                );
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(inherited)",
                                );


@@ -38743,73 +46000,53 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               DC222C751E034D1F00B09171 /* Debug */ = {
+               DC311E752124B8A8002F5EAE /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               EXECUTABLE_PREFIX = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "USE_KEYSTORE=0",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_DYNAMIC_NO_PIC = NO;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = YES;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               DC222C761E034D1F00B09171 /* Release */ = {
+               DC311E762124B8A8002F5EAE /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_OBJC_ARC = YES;
-                               CLANG_WARN_BOOL_CONVERSION = YES;
-                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               EXECUTABLE_PREFIX = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "USE_KEYSTORE=0",
-                                       "$(inherited)",
-                               );
-                               GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+                               EXECUTABLE_PREFIX = lib;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = YES;

                        };
                        name = Release;
                };
                DC3502BB1E0208BE00BC0587 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Release;
                };
                DC3502BB1E0208BE00BC0587 /* Debug */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                        "$(inherited)",


@@ -38817,44 +46054,46 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = keychain/ckks/tests/Info.plist;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = keychain/ckks/tests/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";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               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 = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",

                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",

-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",

                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",

-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",

-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

                                        "-ObjC",
                                        "-framework",
                                        "-ObjC",
                                        "-framework",

-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "-framework",
+                                       TrustedPeers,

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -38863,13 +46102,14 @@
                };
                DC3502BC1E0208BE00BC0587 /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DC3502BC1E0208BE00BC0587 /* Release */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_IDENTITY = "-";

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                        "$(inherited)",


@@ -38877,44 +46117,46 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = keychain/ckks/tests/Info.plist;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = keychain/ckks/tests/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";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               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 = (
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",

-                                       "$(OTHER_LDFLAGS_PROTOBUF)",
-                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",

                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",

-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",

-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "$(APPLE_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
-                                       "$(OTHER_LDFLAGS_PROTOBUF)",

                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",

-                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
-                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
-                                       "$(OTHER_LDFLAGS_APS)",
-                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",

-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",

+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

                                        "-ObjC",
                                        "-framework",
                                        "-ObjC",
                                        "-framework",

-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "-framework",
+                                       TrustedPeers,

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -38922,18 +46164,57 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               DC36896021235F42003A3735 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                       };
+                       name = Debug;
+               };
+               DC36896121235F42003A3735 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                       };
+                       name = Release;
+               };

                DC3A4B5C1D91E9FB00E46D4A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                DC3A4B5C1D91E9FB00E46D4A /* 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;
                                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 = "";
+                               CODE_SIGN_ENTITLEMENTS = OSX/libsecurity_codesigning/CodeSigningHelper/CodeSigningHelper.entitlements;
+                               CODE_SIGN_IDENTITY = "-";

                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;


@@ -38956,12 +46237,12 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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;
                                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 = "";
+                               CODE_SIGN_ENTITLEMENTS = OSX/libsecurity_codesigning/CodeSigningHelper/CodeSigningHelper.entitlements;
+                               CODE_SIGN_IDENTITY = "-";

                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;


@@ -38994,11 +46275,21 @@
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                EXECUTABLE_PREFIX = "";
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                EXECUTABLE_PREFIX = "";

+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "USE_KEYSTORE=1",
+                                       "$(inherited)",
+                               );

                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;

+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -39018,17 +46309,26 @@
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                EXECUTABLE_PREFIX = "";
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                EXECUTABLE_PREFIX = "";

+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "USE_KEYSTORE=1",
+                                       "$(inherited)",
+                               );

                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_TREAT_WARNINGS_AS_ERRORS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;
                };
                DC52E8C41D80C25800B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;
                };
                DC52E8C41D80C25800B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -39051,7 +46351,7 @@
                };
                DC52E8C51D80C25800B0A59C /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DC52E8C51D80C25800B0A59C /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -39071,90 +46371,6 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               DC52EA4A1D80CB7000B0A59C /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = 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;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                       };
-                       name = Debug;
-               };
-               DC52EA4B1D80CB7000B0A59C /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = 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;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                       };
-                       name = Release;
-               };
-               DC52EBD31D80CEF100B0A59C /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = 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;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                       };
-                       name = Debug;
-               };
-               DC52EBD41D80CEF100B0A59C /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
-                       buildSettings = {
-                               CLANG_ANALYZER_NONNULL = 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;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                       };
-                       name = Release;
-               };

                DC52EC321D80CFB200B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
                DC52EC321D80CFB200B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;


@@ -39173,7 +46389,6 @@
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -39195,7 +46410,6 @@
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -39346,6 +46560,10 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)/OSX/regressions/",
+                                       "$(inherited)",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                        };
                        name = Debug;
                                MTL_ENABLE_DEBUG_INFO = YES;
                        };
                        name = Debug;


@@ -39367,6 +46585,10 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(PROJECT_DIR)/OSX/regressions/",
+                                       "$(inherited)",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;
                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;


@@ -39415,7 +46637,7 @@
                };
                DC52EDAF1D80D58400B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                DC52EDAF1D80D58400B0A59C /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -39437,7 +46659,7 @@
                };
                DC52EDB01D80D58400B0A59C /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DC52EDB01D80D58400B0A59C /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56AB1DCA831C00E18518 /* lib_ios_x64.xcconfig */;
+                       baseConfigurationReference = D47C56AF1DCA841D00E18518 /* lib_ios_x64_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -39475,6 +46697,11 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       ./OSX/regressions/,
+                                       ./OSX/shared_regressions/,
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                        };
                        name = Debug;
                                MTL_ENABLE_DEBUG_INFO = YES;
                        };
                        name = Debug;


@@ -39497,6 +46724,11 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

+                               HEADER_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       ./OSX/regressions/,
+                                       ./OSX/shared_regressions/,
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;
                                MTL_ENABLE_DEBUG_INFO = NO;
                        };
                        name = Release;


@@ -39553,7 +46785,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39590,7 +46821,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39623,12 +46853,10 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "c++98";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;


@@ -39652,7 +46880,6 @@
                                PRODUCT_NAME = security;
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_NAME = security;
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;

-                               USE_HEADERMAP = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -39661,12 +46888,10 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "c++98";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;


@@ -39689,7 +46914,6 @@
                                PRODUCT_NAME = security;
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_NAME = security;
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;

-                               USE_HEADERMAP = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -39701,13 +46925,13 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = 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_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

+                               CODE_SIGN_ENTITLEMENTS = securityd/src/securityd.entitlements;

                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",


@@ -39728,10 +46952,7 @@
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ORDER_FILE = securityd/src/securityd.order;
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ORDER_FILE = securityd/src/securityd.order;

-                               OTHER_CPLUSPLUSFLAGS = (
-                                       "$(OTHER_CFLAGS)",
-                                       "-Wno-deprecated-register",
-                               );
+                               OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

                                PRODUCT_NAME = securityd;
                                SUPPORTED_PLATFORMS = macosx;
                        };
                                PRODUCT_NAME = securityd;
                                SUPPORTED_PLATFORMS = macosx;
                        };


@@ -39745,13 +46966,13 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = 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_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

+                               CODE_SIGN_ENTITLEMENTS = securityd/src/securityd.entitlements;

                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",


@@ -39772,10 +46993,7 @@
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                ORDER_FILE = securityd/src/securityd.order;
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                ORDER_FILE = securityd/src/securityd.order;

-                               OTHER_CPLUSPLUSFLAGS = (
-                                       "$(OTHER_CFLAGS)",
-                                       "-Wno-deprecated-register",
-                               );
+                               OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

                                PRODUCT_NAME = securityd;
                                SUPPORTED_PLATFORMS = macosx;
                        };
                                PRODUCT_NAME = securityd;
                                SUPPORTED_PLATFORMS = macosx;
                        };


@@ -39786,13 +47004,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39804,7 +47020,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -39828,13 +47043,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39847,7 +47060,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -39863,7 +47075,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "LIBTRUSTD=1",
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "LIBTRUSTD=1",
                                        "$(inherited)",


@@ -39871,15 +47083,14 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_IMCORE)",

-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;


@@ -39890,7 +47101,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "LIBTRUSTD=1",
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "LIBTRUSTD=1",
                                        "$(inherited)",


@@ -39898,15 +47109,14 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_IMCORE)",

-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;


@@ -39923,7 +47133,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39955,7 +47164,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -39987,7 +47195,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40017,7 +47224,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40048,7 +47254,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40079,7 +47284,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40122,7 +47326,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -40138,7 +47341,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;


@@ -40191,43 +47393,61 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               DC71D9DD1D95BA6C0065FB93 /* Debug */ = {
+               DC6D1C76208A547400AB21AF /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               DC6D1C77208A547400AB21AF /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               DC7FC44D21EE914D003C39B8 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               GCC_WARN_SHADOW = NO;
-                               "HEADER_SEARCH_PATHS[sdk=embedded*]" = (
-                                       "$(PROJECT_DIR)/header_symlinks/iOS",
-                                       "$(inherited)",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = featureflags/Info.plist;
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.FeatureFlagsPlist;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_asn1;
+                               SKIP_INSTALL = YES;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               DC71D9DE1D95BA6C0065FB93 /* Release */ = {
+               DC7FC44E21EE914D003C39B8 /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_WARN_SUSPICIOUS_MOVES = YES;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
-                               GCC_WARN_SHADOW = NO;
-                               "HEADER_SEARCH_PATHS[sdk=embedded*]" = (
-                                       "$(PROJECT_DIR)/header_symlinks/iOS",
-                                       "$(inherited)",
-                               );
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = featureflags/Info.plist;
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";

                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;

+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.FeatureFlagsPlist;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/security_asn1;
+                               SKIP_INSTALL = YES;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -40265,7 +47485,6 @@
                };
                DC8834061D8A218F00CE0ACA /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                DC8834061D8A218F00CE0ACA /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_MODULES = NO;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_MODULES = NO;


@@ -40286,7 +47505,6 @@
                };
                DC8834071D8A218F00CE0ACA /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DC8834071D8A218F00CE0ACA /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = D47C56FB1DCA8F4900E18518 /* all_arches.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_MODULES = NO;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_MODULES = NO;


@@ -40310,13 +47528,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40328,7 +47544,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40352,13 +47567,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40371,7 +47584,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40388,13 +47600,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40406,7 +47616,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40430,13 +47639,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40449,7 +47656,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40466,13 +47672,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40484,7 +47688,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40508,13 +47711,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40527,7 +47728,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40544,13 +47744,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40562,7 +47760,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40586,13 +47783,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40605,7 +47800,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40622,13 +47816,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40640,7 +47832,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40664,13 +47855,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40683,7 +47872,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40700,13 +47888,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40718,7 +47904,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40742,13 +47927,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40761,7 +47944,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40778,13 +47960,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40796,7 +47976,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40820,13 +47999,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40839,7 +48016,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40856,13 +48032,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40874,7 +48048,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -40898,13 +48071,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -40917,7 +48088,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -40929,81 +48099,184 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               DC8E04B31D7F6EC9006D80EB /* Debug */ = {
+               DC8E04B31D7F6EC9006D80EB /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               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_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;
+                               DEBUGGING_SYMBOLS = YES;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = "";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               DC8E04B41D7F6EC9006D80EB /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ENABLE_MODULES = YES;
+                               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_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;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = "";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               DC99B89020EACA470065B73B /* Debug */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = 725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_ENABLE_MODULES = YES;
-                               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;
-                               DEBUGGING_SYMBOLS = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_NO_COMMON_BLOCKS = YES;
-                               GCC_OPTIMIZATION_LEVEL = 0;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

+                                       "NO_SERVER=1",

                                        "DEBUG=1",
                                        "$(inherited)",
                                );
                                        "DEBUG=1",
                                        "$(inherited)",
                                );

-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
+                               INFOPLIST_FILE = "keychain/ot/tests/octagon/OctagonTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOCK_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",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                               );
+                               OTHER_SWIFT_FLAGS = "-D OCTAGON_TEST_FILL_ZONEKEYS $(inherited)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = NO;
+                               SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/ot/tests/octagon/OctagonTests-BridgingHeader.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               DC8E04B41D7F6EC9006D80EB /* Release */ = {
+               DC99B89120EACA470065B73B /* Release */ = {

                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = 725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.xcconfig */;

                        buildSettings = {
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_ENABLE_MODULES = YES;
-                               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;
-                               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;
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "NDEBUG=1",
+                                       "$(inherited)",
+                               );
+                               INFOPLIST_FILE = "keychain/ot/tests/octagon/OctagonTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
+                               );
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_MOCK_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",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                               );
+                               OTHER_SWIFT_FLAGS = "-D OCTAGON_TEST_FILL_ZONEKEYS $(inherited)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = NO;
+                               SWIFT_OBJC_BRIDGING_HEADER = "keychain/ot/tests/octagon/OctagonTests-BridgingHeader.h";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -41012,7 +48285,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41025,7 +48297,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41038,7 +48309,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41052,7 +48322,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41066,7 +48335,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41079,7 +48347,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41092,7 +48359,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41105,7 +48371,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41118,16 +48383,12 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-switch",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -41136,16 +48397,12 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-switch",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -41155,7 +48412,6 @@
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";


@@ -41170,7 +48426,6 @@
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";


@@ -41179,9 +48434,113 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               DCBF4ADE21FFC82100539F0A /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = "keychain/escrowrequest/tests/SecEscrowRequestsTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "-ObjC",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecEscrowRequestTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               DCBF4ADF21FFC82100539F0A /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NO_SERVER=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = "keychain/escrowrequest/tests/SecEscrowRequestsTests-Info.plist";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
+                               );
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(inherited)",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
+                                       "$(OTHER_LDFLAGS_APS)",
+                                       "$(OTHER_LDFLAGS_CLOUDKIT)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_DIAGNOSTICSMESSAGESCLIENT)",
+                                       "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_MOBILEGESTALT)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_PREQUELITE)",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
+                                       "-ObjC",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecEscrowRequestTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };

                DCC78EB01D8088E200865A7C /* Debug */ = {
                        isa = XCBuildConfiguration;
                DCC78EB01D8088E200865A7C /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -41204,7 +48563,7 @@
                };
                DCC78EB11D8088E200865A7C /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DCC78EB11D8088E200865A7C /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -41228,7 +48587,6 @@
                DCD067581D8CDCF4007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD067581D8CDCF4007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;


@@ -41236,7 +48594,6 @@
                DCD067591D8CDCF4007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD067591D8CDCF4007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;


@@ -41244,7 +48601,6 @@
                DCD0675E1D8CDD6D007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD0675E1D8CDD6D007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;


@@ -41252,7 +48608,6 @@
                DCD0675F1D8CDD6D007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD0675F1D8CDD6D007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;


@@ -41264,7 +48619,7 @@
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

-                               CLANG_WARN_ENUM_CONVERSION = NO;
+                               CLANG_WARN_ENUM_CONVERSION = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (


@@ -41276,10 +48631,7 @@
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = NO;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = NO;

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -41290,7 +48642,7 @@
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_DOCUMENTATION_COMMENTS = NO;

-                               CLANG_WARN_ENUM_CONVERSION = NO;
+                               CLANG_WARN_ENUM_CONVERSION = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                HEADER_SEARCH_PATHS = (


@@ -41302,17 +48654,13 @@
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = NO;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SKIP_INSTALL = NO;

-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                DCD069691D8CE105007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Release;
                };
                DCD069691D8CE105007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;


@@ -41320,7 +48668,6 @@
                DCD0696A1D8CE105007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD0696A1D8CE105007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;


@@ -41330,13 +48677,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41348,7 +48693,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -41372,13 +48716,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41391,7 +48733,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -41408,7 +48749,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41422,7 +48762,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41436,7 +48775,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -41450,7 +48788,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -41527,7 +48864,6 @@
                DCD06A7D1D8CE330007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD06A7D1D8CE330007602F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;


@@ -41535,7 +48871,6 @@
                DCD06A7E1D8CE330007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                DCD06A7E1D8CE330007602F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               DEVELOPMENT_TEAM = XPSUQMMH5W;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;


@@ -41566,8 +48901,6 @@
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",

-                                       "-Wno-deprecated-register",
-                                       "-Wno-vla-extension",

                                );
                        };
                        name = Debug;
                                );
                        };
                        name = Debug;


@@ -41598,8 +48931,6 @@
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",

-                                       "-Wno-deprecated-register",
-                                       "-Wno-vla-extension",

                                );
                        };
                        name = Release;
                                );
                        };
                        name = Release;


@@ -41690,7 +49021,7 @@
                };
                DCD8A1971E09EE0F00E4FA0A /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                DCD8A1971E09EE0F00E4FA0A /* Debug */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -41714,7 +49045,7 @@
                };
                DCD8A1981E09EE0F00E4FA0A /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                DCD8A1981E09EE0F00E4FA0A /* Release */ = {
                        isa = XCBuildConfiguration;

-                       baseConfigurationReference = DC8E04901D7F6780006D80EB /* lib_ios.xcconfig */;
+                       baseConfigurationReference = DC71D8DD1D94CF3C0065FB93 /* lib_ios_shim.xcconfig */;

                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;


@@ -41735,11 +49066,31 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               DCDA5E502124B9C6009B11B2 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               DCDA5E512124B9C6009B11B2 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_STYLE = Automatic;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };

                DCE4E6A21D7A37FA00AFB96E /* Debug */ = {
                        isa = XCBuildConfiguration;
                DCE4E6A21D7A37FA00AFB96E /* Debug */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/SecurityTool/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/macOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;

                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",


@@ -41747,18 +49098,24 @@
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;
                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                        };
                        name = Debug;
                };
                DCE4E6A31D7A37FA00AFB96E /* Release */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Debug;
                };
                DCE4E6A31D7A37FA00AFB96E /* Release */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;
                        buildSettings = {
                                CLANG_ENABLE_OBJC_ARC = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/SecurityTool/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/macOS/entitlements.plist;
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               GCC_WARN_SHADOW = NO;

                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",


@@ -41766,10 +49123,12 @@
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;
                                );
                                PRODUCT_NAME = security2;
                                SUPPORTED_PLATFORMS = macosx;

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -41783,7 +49142,10 @@
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",


@@ -41794,6 +49156,10 @@
                                        "-lImg4Decode",
                                        "-lSystem",
                                );
                                        "-lImg4Decode",
                                        "-lSystem",
                                );

+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-framework",
+                                       EmbeddedOSSupportHost,
+                               );

                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTED_PLATFORMS = macosx;


@@ -41810,7 +49176,10 @@
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = OSX/SecurityTestsOSX/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security/;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",
                                OTHER_LDFLAGS = "";
                                "OTHER_LDFLAGS[sdk=embedded]" = (
                                        "$(inherited)",


@@ -41821,6 +49190,10 @@
                                        "-lImg4Decode",
                                        "-lSystem",
                                );
                                        "-lImg4Decode",
                                        "-lSystem",
                                );

+                               "OTHER_LDFLAGS[sdk=macosx*]" = (
+                                       "-framework",
+                                       EmbeddedOSSupportHost,
+                               );

                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTED_PLATFORMS = macosx;


@@ -41836,7 +49209,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41867,7 +49239,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41900,7 +49271,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41909,7 +49279,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;


@@ -41922,22 +49292,22 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               INFOPLIST_FILE = "OSX/sec/securityd/Info-macOS.plist";
+                               INFOPLIST_FILE = "keychain/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 = (
                                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_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_IMCORE)",

+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -41951,7 +49321,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -41960,7 +49329,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/securityd/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                COPY_PHASE_STRIP = NO;
                                CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                COPY_PHASE_STRIP = NO;
                                CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
                                ENABLE_NS_ASSERTIONS = NO;


@@ -41974,22 +49343,22 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               INFOPLIST_FILE = "OSX/sec/securityd/Info-macOS.plist";
+                               INFOPLIST_FILE = "keychain/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 = (
                                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_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_IMCORE)",

+                                       "$(OTHER_LDFLAGS_CORECDP)",
+                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",

                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -42003,7 +49372,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42012,7 +49380,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/trustd/macOS/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = trust/trustd/macOS/entitlements.plist;

                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -42024,16 +49392,14 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = YES;

-                               PRODUCT_NAME = trustd;
-                               WARNING_CFLAGS = (
-                                       "-Wextra",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-missing-field-initializers",
-                                       "-Wno-error=deprecated-declarations",
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                );

+                               PRODUCT_NAME = trustd;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -42047,7 +49413,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42056,7 +49421,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/trustd/macOS/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = trust/trustd/macOS/entitlements.plist;

                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;


@@ -42069,16 +49434,14 @@
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

-                               GCC_WARN_UNUSED_FUNCTION = NO;
+                               GCC_WARN_UNUSED_FUNCTION = YES;

                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               PRODUCT_NAME = trustd;
-                               WARNING_CFLAGS = (
-                                       "-Wextra",
-                                       "-Wno-unused-parameter",
-                                       "-Wno-missing-field-initializers",
-                                       "-Wno-error=deprecated-declarations",
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                );

+                               PRODUCT_NAME = trustd;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -42089,7 +49452,6 @@
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42106,7 +49468,7 @@
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               GCC_WARN_UNINITIALIZED_AUTOS = NO;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;

                                INFOPLIST_FILE = OSX/authd/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/${FRAMEWORK_VERSION}/XPCServices";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                INFOPLIST_FILE = OSX/authd/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/${FRAMEWORK_VERSION}/XPCServices";
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -42122,7 +49484,6 @@
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42140,7 +49501,7 @@
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;

-                               GCC_WARN_UNINITIALIZED_AUTOS = NO;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES;

                                INFOPLIST_FILE = OSX/authd/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/${FRAMEWORK_VERSION}/XPCServices";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                INFOPLIST_FILE = OSX/authd/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Versions/${FRAMEWORK_VERSION}/XPCServices";
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -42159,7 +49520,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42168,7 +49528,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/SecurityTool/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/macOS/entitlements.plist;

                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_DYNAMIC_NO_PIC = NO;


@@ -42187,7 +49547,10 @@
                                );
                                INFOPLIST_FILE = "OSX/Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                );
                                INFOPLIST_FILE = "OSX/Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -42204,7 +49567,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42213,7 +49575,7 @@
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = OSX/sec/SecurityTool/entitlements.plist;
+                               CODE_SIGN_ENTITLEMENTS = SecurityTool/sharedTool/macOS/entitlements.plist;

                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;


@@ -42228,7 +49590,10 @@
                                );
                                INFOPLIST_FILE = "OSX/Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                );
                                INFOPLIST_FILE = "OSX/Keychain/Keychain-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -42245,7 +49610,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42269,11 +49633,13 @@
                                );
                                INFOPLIST_FILE = "OSX/Keychain Circle Notification/Keychain Circle Notification-Info.plist";
                                INSTALL_PATH = /System/Library/CoreServices;
                                );
                                INFOPLIST_FILE = "OSX/Keychain Circle Notification/Keychain Circle Notification-Info.plist";
                                INSTALL_PATH = /System/Library/CoreServices;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -42287,7 +49653,6 @@
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42311,11 +49676,66 @@
                                );
                                INFOPLIST_FILE = "OSX/Keychain Circle Notification/Keychain Circle Notification-Info.plist";
                                INSTALL_PATH = /System/Library/CoreServices;
                                );
                                INFOPLIST_FILE = "OSX/Keychain Circle Notification/Keychain Circle Notification-Info.plist";
                                INSTALL_PATH = /System/Library/CoreServices;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                       };
+                       name = Release;
+               };
+               DCF216D821ADD5B10029CCC1 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MACOSX_DEPLOYMENT_TARGET = 10.14;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = 5.0;
+                       };
+                       name = Debug;
+               };
+               DCF216D921ADD5B10029CCC1 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               EXECUTABLE_PREFIX = lib;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MACOSX_DEPLOYMENT_TARGET = 10.14;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                               SWIFT_VERSION = 5.0;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -42324,13 +49744,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42342,7 +49760,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -42366,13 +49783,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -42385,7 +49800,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -42403,7 +49817,6 @@
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42427,7 +49840,6 @@
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42450,7 +49862,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42474,7 +49885,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;

                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42498,7 +49908,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -42511,7 +49920,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -42524,7 +49932,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -42537,7 +49944,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -42550,7 +49956,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -42563,7 +49968,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -42577,18 +49981,15 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = 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;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42611,11 +50012,9 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = 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_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;


@@ -42624,7 +50023,6 @@
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                COPY_PHASE_STRIP = NO;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -42641,7 +50039,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = YES;


@@ -42654,7 +50051,6 @@
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        baseConfigurationReference = DC0067911D87816C005AF8DB /* macos_legacy_lib.xcconfig */;
                        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;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -42662,9 +50058,240 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

+               E060D1CB212478120025B833 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarnessXPCServiceProtocol/Info.plist;
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+                               IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarnessXPCServiceProtocol;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               SKIP_INSTALL = YES;
+                               SUPPORTS_TEXT_BASED_API = NO;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                       };
+                       name = Debug;
+               };
+               E060D1CC212478120025B833 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarnessXPCServiceProtocol/Info.plist;
+                               INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+                               IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarnessXPCServiceProtocol;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               SKIP_INSTALL = YES;
+                               SUPPORTS_TEXT_BASED_API = NO;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               E060D1CE212478120025B833 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/Trieste/$(TARGET_NAME)/Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarnessXPCService/Info.plist;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "-framework",
+                                       Security,
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarnessXPCService;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                               SUPPORTS_TEXT_BASED_API = NO;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                       };
+                       name = Debug;
+               };
+               E060D1CF212478120025B833 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_ENTITLEMENTS = "keychain/Trieste/$(TARGET_NAME)/Entitlements.plist";
+                               CODE_SIGN_STYLE = Automatic;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarnessXPCService/Info.plist;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "-framework",
+                                       Security,
+                               );
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarnessXPCService;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = YES;
+                               SUPPORTS_TEXT_BASED_API = NO;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
+               E060D1D3212478120025B833 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               EXPORTED_SYMBOLS_FILE = keychain/Trieste/OctagonTestHarness/OctagonTestHarness.exp;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GENERATE_TEXT_BASED_STUBS = YES;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarness/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/Frameworks;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarness;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Debug;
+               };
+               E060D1D4212478120025B833 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CODE_SIGN_IDENTITY = "";
+                               CODE_SIGN_STYLE = Automatic;
+                               CURRENT_PROJECT_VERSION = 1;
+                               DEFINES_MODULE = YES;
+                               DYLIB_COMPATIBILITY_VERSION = 1;
+                               DYLIB_CURRENT_VERSION = 1;
+                               DYLIB_INSTALL_NAME_BASE = "@rpath";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               EXPORTED_SYMBOLS_FILE = keychain/Trieste/OctagonTestHarness/OctagonTestHarness.exp;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GENERATE_TEXT_BASED_STUBS = YES;
+                               INFOPLIST_FILE = keychain/Trieste/OctagonTestHarness/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/Frameworks;
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@loader_path/Frameworks",
+                               );
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.trieste.OctagonTestHarness;
+                               PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               VALIDATE_PRODUCT = YES;
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
+                       };
+                       name = Release;
+               };

                E710C75D1331946500F85568 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E710C75D1331946500F85568 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
                                COMBINE_HIDPI_IMAGES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
                                COMBINE_HIDPI_IMAGES = YES;


@@ -42675,7 +50302,10 @@
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",


@@ -42685,16 +50315,8 @@
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
-                                       "-lSecureKeyVaultForiapd",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",


@@ -42702,10 +50324,15 @@
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "-framework",
-                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -42716,6 +50343,7 @@
                E710C75E1331946500F85568 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E710C75E1331946500F85568 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
                                COMBINE_HIDPI_IMAGES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CODE_SIGN_ENTITLEMENTS = "SecurityTests/SecurityTests-Entitlements.plist";
                                COMBINE_HIDPI_IMAGES = YES;


@@ -42726,7 +50354,10 @@
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;
                                HEADER_SEARCH_PATHS = "$(inherited)";
                                INFOPLIST_FILE = "SecurityTests/SecurityTests-Info.plist";
                                INSTALL_PATH = /AppleInternal/Applications;

-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/../Frameworks",
+                               );

                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",


@@ -42736,16 +50367,8 @@
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "$(inherited)",
-                                       "-framework",
-                                       MobileKeyBag,
-                                       "-laks",
-                                       "-lACM",
-                                       "-lImg4Decode",
-                                       "-lSystem",
-                                       "-lSecureKeyVaultForiapd",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_APS)",


@@ -42753,10 +50376,15 @@
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",

-                                       "-framework",
-                                       CrashReporterSupport,
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",

                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -42820,31 +50448,14 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               E79EEDE21CD4000C00C2FBFC /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               E79EEDE31CD4000C00C2FBFC /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };

                E7B01BF0166594AB000485F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7B01BF0166594AB000485F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -42859,6 +50470,7 @@
                                        "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",

+                                       "$(PROJECT_DIR)/OSX/include",

                                        "$(PROJECT_DIR)/OSX/sec",
                                        "$(PROJECT_DIR)/OSX/utilities",
                                        "$(BUILT_PRODUCTS_DIR)/usr/local/include",
                                        "$(PROJECT_DIR)/OSX/sec",
                                        "$(PROJECT_DIR)/OSX/utilities",
                                        "$(BUILT_PRODUCTS_DIR)/usr/local/include",


@@ -42889,14 +50501,11 @@
                E7B01BF1166594AB000485F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7B01BF1166594AB000485F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = YES;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",


@@ -42904,6 +50513,7 @@
                                        "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",
                                        "$(SDKROOT)/usr/local/include/security_libDER",
                                        "$(PROJECT_DIR)/OSX/libsecurity_asn1",
                                        "$(PROJECT_DIR)/libsecurity_smime",

+                                       "$(PROJECT_DIR)/OSX/include",

                                        "$(PROJECT_DIR)/OSX/sec",
                                        "$(PROJECT_DIR)/OSX/utilities",
                                        "$(BUILT_PRODUCTS_DIR)/usr/local/include",
                                        "$(PROJECT_DIR)/OSX/sec",
                                        "$(PROJECT_DIR)/OSX/utilities",
                                        "$(BUILT_PRODUCTS_DIR)/usr/local/include",


@@ -42935,6 +50545,7 @@
                E7CFF6481C84F61200E3484E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7CFF6481C84F61200E3484E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;


@@ -42942,6 +50553,7 @@
                E7CFF6491C84F61200E3484E /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7CFF6491C84F61200E3484E /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               INSTALLHDRS_SCRIPT_PHASE = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;


@@ -42950,7 +50562,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -42969,7 +50580,6 @@
                                DYLIB_CURRENT_VERSION = 1;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                FRAMEWORK_VERSION = A;
                                DYLIB_CURRENT_VERSION = 1;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                FRAMEWORK_VERSION = A;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",


@@ -42980,17 +50590,22 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = KeychainCircle/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = KeychainCircle/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

-                               IS_ZIPPERED = YES;
+                               IS_ZIPPERED = NO;
+                               "IS_ZIPPERED[sdk=macosx*]" = YES;

                                MODULEMAP_FILE = Modules/KeychainCircle.modulemap;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                MODULEMAP_FILE = Modules/KeychainCircle.modulemap;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;

-                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEGESTALT)";
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                               );

                                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 = "";

+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -42998,7 +50613,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43018,17 +50632,20 @@
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                FRAMEWORK_VERSION = A;
                                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;
                                INFOPLIST_FILE = KeychainCircle/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = KeychainCircle/Info.plist;
                                INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";

-                               IS_ZIPPERED = YES;
+                               IS_ZIPPERED = NO;
+                               "IS_ZIPPERED[sdk=macosx*]" = YES;

                                MODULEMAP_FILE = Modules/KeychainCircle.modulemap;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MODULEMAP_FILE = Modules/KeychainCircle.modulemap;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_MOBILEGESTALT)";
+                               OTHER_LDFLAGS = (
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
+                                       "$(OTHER_LDFLAGS_UPWARD_PROTOCOLBUFFER)",
+                               );

                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircle;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircle;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;


@@ -43043,7 +50660,6 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43058,7 +50674,6 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;


@@ -43069,7 +50684,7 @@
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,
                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,


@@ -43099,7 +50714,7 @@
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",


@@ -43120,7 +50735,6 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43137,7 +50751,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -43146,7 +50759,7 @@
                                INSTALL_PATH = /AppleInternal/Tests/Security/;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                INSTALL_PATH = /AppleInternal/Tests/Security/;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",


@@ -43177,7 +50790,7 @@
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,
                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,


@@ -43191,234 +50804,11 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               EB056E471FE5E391000A771E /* 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_OBJC_WEAK = YES;
-                               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 = "MultiDeviceSimulator/DeviceSimulator/DeviceSimulator-Entitlements.plist";
-                               CODE_SIGN_STYLE = Automatic;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = MultiDeviceSimulator/DeviceSimulator/Info.plist;
-                               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_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "-ObjC",
-                               );
-                               "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)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "-ObjC",
-                                       "-framework",
-                                       CrashReporterSupport,
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.DeviceSimulator;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = YES;
-                       };
-                       name = Debug;
-               };
-               EB056E481FE5E391000A771E /* 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_OBJC_WEAK = YES;
-                               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 = "MultiDeviceSimulator/DeviceSimulator/DeviceSimulator-Entitlements.plist";
-                               CODE_SIGN_STYLE = Automatic;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = MultiDeviceSimulator/DeviceSimulator/Info.plist;
-                               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_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "-ObjC",
-                               );
-                               "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)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_APPLEACCOUNT)",
-                                       "-ObjC",
-                                       "-framework",
-                                       CrashReporterSupport,
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.DeviceSimulator;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = YES;
-                       };
-                       name = Release;
-               };
-               EB05C4F61FE5E48B00D68712 /* 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_OBJC_WEAK = YES;
-                               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_STYLE = Automatic;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
-                               );
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INFOPLIST_FILE = MultiDeviceSimulator/MultiDeviceSimulatorTests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.MultiDeviceSimulatorTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = NO;
-                       };
-                       name = Debug;
-               };
-               EB05C4F71FE5E48B00D68712 /* 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_OBJC_WEAK = YES;
-                               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_STYLE = Automatic;
-                               COMBINE_HIDPI_IMAGES = YES;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INFOPLIST_FILE = MultiDeviceSimulator/MultiDeviceSimulatorTests/Info.plist;
-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
-                               MTL_ENABLE_DEBUG_INFO = NO;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.MultiDeviceSimulatorTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               SKIP_INSTALL = NO;
-                       };
-                       name = Release;
-               };

                EB0BC93C1C3C791500785842 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                EB0BC93C1C3C791500785842 /* 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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43434,7 +50824,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -43475,7 +50864,6 @@
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43492,7 +50880,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -43528,13 +50915,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -43546,7 +50931,6 @@
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUGGING_SYMBOLS = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;


@@ -43570,13 +50954,11 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = YES;
                                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_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INFINITE_RECURSION = YES;


@@ -43589,7 +50971,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -43606,9 +50987,7 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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;
                                COPY_PHASE_STRIP = NO;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                COPY_PHASE_STRIP = NO;


@@ -43616,7 +50995,6 @@
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                EXECUTABLE_PREFIX = lib;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                EXECUTABLE_PREFIX = lib;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;


@@ -43633,9 +51011,7 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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;
                                COPY_PHASE_STRIP = NO;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                COPY_PHASE_STRIP = NO;


@@ -43643,7 +51019,6 @@
                                DYLIB_CURRENT_VERSION = 1;
                                ENABLE_NS_ASSERTIONS = NO;
                                EXECUTABLE_PREFIX = lib;
                                DYLIB_CURRENT_VERSION = 1;
                                ENABLE_NS_ASSERTIONS = NO;
                                EXECUTABLE_PREFIX = lib;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)/lib";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)/lib";


@@ -43659,7 +51034,6 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43674,7 +51048,6 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;


@@ -43682,11 +51055,11 @@
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = "KeychainCircle/Tests/KCPairingTest-Info.plist";
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = "KeychainCircle/Tests/KCPairingTest-Info.plist";

-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";

                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,
                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,


@@ -43716,7 +51089,7 @@
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",


@@ -43729,6 +51102,7 @@
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircleTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircleTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;

+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -43737,7 +51111,6 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43754,17 +51127,16 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = "KeychainCircle/Tests/KCPairingTest-Info.plist";
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                INFOPLIST_FILE = "KeychainCircle/Tests/KCPairingTest-Info.plist";

-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";

                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "-lACM",
                                        "-framework",


@@ -43795,7 +51167,7 @@
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                );
                                "OTHER_LDFLAGS[sdk=macosx*]" = (

-                                       "$(APPLE_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",

                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,
                                        "-lACM",
                                        "-framework",
                                        SystemConfiguration,


@@ -43806,6 +51178,7 @@
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircleTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainCircle.KeychainCircleTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                SUPPORTS_TEXT_BASED_API = YES;

+                               TEST_BUILD_STYLE = _APPLEINTERNAL;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -43815,12 +51188,10 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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/ckksctl/ckksctl-Entitlements.plist";
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "keychain/ckksctl/ckksctl-Entitlements.plist";

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/sbin;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/sbin;


@@ -43835,14 +51206,12 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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/ckksctl/ckksctl-Entitlements.plist";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "keychain/ckksctl/ckksctl-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/sbin;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -43854,7 +51223,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43869,7 +51237,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -43909,7 +51276,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43925,7 +51291,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -43961,7 +51326,6 @@
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -43977,7 +51341,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -44018,7 +51381,6 @@
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44035,7 +51397,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -44070,7 +51431,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44086,7 +51446,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -44126,7 +51485,6 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44143,7 +51501,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -44176,11 +51533,11 @@
                };
                EB49B2B3202D8780003F34A0 /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                EB49B2B3202D8780003F34A0 /* Debug */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;


@@ -44203,8 +51560,14 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = tests/secdmockaks/Info.plist;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = tests/secdmockaks/Info.plist;

-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",


@@ -44218,6 +51581,11 @@
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -44227,11 +51595,11 @@
                };
                EB49B2B4202D8780003F34A0 /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                EB49B2B4202D8780003F34A0 /* Release */ = {
                        isa = XCBuildConfiguration;

+                       baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;

                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;


@@ -44254,8 +51622,14 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = tests/secdmockaks/Info.plist;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = tests/secdmockaks/Info.plist;

-                               INSTALL_PATH = /AppleInternal/XCTests/com.apple.security;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks @loader_path/Frameworks @loader_path/../Frameworks";
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "@executable_path/Frameworks",
+                                       "@executable_path/../Frameworks",
+                                       "@loader_path/Frameworks",
+                                       "@loader_path/../Frameworks",
+                               );

                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",


@@ -44269,6 +51643,11 @@
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",

+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",

                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.Security.secdmockaks;
                                PRODUCT_NAME = "$(TARGET_NAME)";


@@ -44276,54 +51655,81 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               EB6A6FAA1B90F83A0045DC68 /* Release */ = {
+               EB6952B7223B75C300F02C1C /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-                               CLANG_CXX_LIBRARY = "libc++";
-                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_ENABLE_MODULES = NO;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                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_IDENTITY[sdk=embedded*]" = "iPhone Developer";
-                               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;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                GCC_PREPROCESSOR_DEFINITIONS = (

-                                       "DEBUG=1",
+                                       "SECD_SERVER=1",
+                                       "TARGET_DARWINOS=1",

                                        "$(inherited)",
                                );
                                        "$(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;
-                               IPHONEOS_DEPLOYMENT_TARGET = 9.3;
-                               MTL_ENABLE_DEBUG_INFO = YES;
-                               ONLY_ACTIVE_ARCH = YES;
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       IOKit,
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LLVM_LTO = NO;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",

                                );
                                );

-                               PRODUCT_NAME = phase1_ios;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               REEXPORTED_LIBRARY_NAMES = "";
+                               STRIP_STYLE = debugging;
+                               USE_HEADERMAP = YES;
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        };

-                       name = Release;
+                       name = Debug;

                };
                };

-               EB6A6FAB1B90F83A0045DC68 /* Release */ = {
+               EB6952B8223B75C300F02C1C /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "SECD_SERVER=1",
+                                       "TARGET_DARWINOS=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LLVM_LTO = NO;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               REEXPORTED_LIBRARY_NAMES = "";
+                               STRIP_STYLE = debugging;
+                               USE_HEADERMAP = YES;
+                               WARNING_CFLAGS = "$(inherited)";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -44341,145 +51747,168 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               EB6A6FB61B90F8C90045DC68 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               EB6A6FB71B90F8C90045DC68 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };
-               EB9C1D811BDFD0E100F89272 /* Debug */ = {
+               EB74CC1B2207E48100F1BBAD /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               CODE_SIGN_STYLE = Automatic;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;

-                               ENABLE_STRICT_OBJC_MSGSEND = YES;
-                               ENABLE_TESTABILITY = YES;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                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_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;
+                               INFOPLIST_FILE = keychain/KeychainSettings/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;
+                               IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;

                                OTHER_LDFLAGS = (
                                        "-framework",
                                OTHER_LDFLAGS = (
                                        "-framework",

-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
+                                       AppleAccount,

                                        "-framework",
                                        "-framework",

-                                       Security,
+                                       AuthKit,

                                        "-framework",
                                        "-framework",

-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
+                                       Accounts,

                                );
                                );

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainSettings;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               SDKROOT = iphoneos.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";
+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               EB9C1D821BDFD0E100F89272 /* Release */ = {
+               EB74CC1C2207E48100F1BBAD /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_ENABLE_OBJC_WEAK = YES;

                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_OBJC_ROOT_CLASS = YES_ERROR;

+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;

                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;

-                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-                               COPY_PHASE_STRIP = NO;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               CODE_SIGN_STYLE = Automatic;

                                ENABLE_NS_ASSERTIONS = NO;
                                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_ABOUT_RETURN_TYPE = YES_ERROR;

-                               GCC_WARN_UNDECLARED_SELECTOR = YES;
-                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               INFOPLIST_FILE = keychain/KeychainSettings/Info.plist;
+                               INSTALL_PATH = /AppleInternal/Library/PreferenceBundles/;
+                               IPHONEOS_DEPLOYMENT_TARGET = 13.0;

                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                        "-framework",
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                        "-framework",

-                                       Security,
-                               );
-                               "OTHER_LDFLAGS[sdk=embedded]" = (
-                                       "-laks",
-                                       "-framework",
-                                       Security,
-                                       "-framework",
-                                       IOKit,
-                               );
-                               "OTHER_LDFLAGS[sdk=macosx*]" = (
-                                       "-laks",
+                                       AppleAccount,

                                        "-framework",
                                        "-framework",

-                                       Security,
+                                       AuthKit,

                                        "-framework",
                                        "-framework",

-                                       IOKit,
+                                       Accounts,

                                );
                                );

+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainSettings;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

-                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               SDKROOT = iphoneos.internal;
+                               TARGETED_DEVICE_FAMILY = "1,2";

                                VALIDATE_PRODUCT = YES;
                                VALIDATE_PRODUCT = YES;

+                               WRAPPER_EXTENSION = bundle;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               EB9C1DB01BDFD4DF00F89272 /* Debug */ = {
+               EB7E90F32193F90800B1FA21 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               EB9C1DB11BDFD4DF00F89272 /* Release */ = {
+               EB7E90F42193F90800B1FA21 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

+                               CODE_SIGN_STYLE = Automatic;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };

-               EBA9AA841CE30E58004E2B68 /* Debug */ = {
+               EB89088421F17D3C00F0DDDB /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "SECD_SERVER=1",
+                                       "TARGET_DARWINOS=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LLVM_LTO = NO;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );
+                               PRODUCT_NAME = recovery_securityd;
+                               REEXPORTED_LIBRARY_NAMES = "";
+                               STRIP_STYLE = debugging;
+                               USE_HEADERMAP = YES;
+                               WARNING_CFLAGS = "$(inherited)";
+                       };
+                       name = Debug;
+               };
+               EB89088521F17D3C00F0DDDB /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CODE_SIGN_ENTITLEMENTS = keychain/securityd/entitlements.plist;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "SECD_SERVER=1",
+                                       "TARGET_DARWINOS=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+                               INSTALL_PATH = /usr/libexec;
+                               LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/local/lib";
+                               LLVM_LTO = NO;
+                               OTHER_CODE_SIGN_FLAGS = "$(OTHER_CODE_SIGN_FLAGS_LIBRARY_VALIDATION)";
+                               OTHER_LDFLAGS = (
+                                       "$(inherited)",
+                                       "-ObjC",
+                                       "$(OTHER_LDFLAGS_PROTOBUF)",
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_SYMPTOMDIAGNOSTICREPORTER)",
+                               );
+                               PRODUCT_NAME = recovery_securityd;
+                               REEXPORTED_LIBRARY_NAMES = "";
+                               STRIP_STYLE = debugging;
+                               USE_HEADERMAP = YES;
+                               WARNING_CFLAGS = "$(inherited)";
+                       };
+                       name = Release;
+               };
+               EB9C1D811BDFD0E100F89272 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44491,11 +51920,9 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemnotifications/secitemnotifications.entitlements;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -44531,11 +51958,10 @@
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               EBA9AA851CE30E58004E2B68 /* Release */ = {
+               EB9C1D821BDFD0E100F89272 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44547,12 +51973,10 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemnotifications/secitemnotifications.entitlements;

                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = 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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -44583,71 +52007,25 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               EBB696031BE1F9DE00715F16 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = Security_executables_Bridge;
-                       };
-                       name = Debug;
-               };
-               EBB696041BE1F9DE00715F16 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               PRODUCT_NAME = phase1_ios;
-                       };
-                       name = Debug;
-               };
-               EBB839AA1E29665E00853BAC /* Debug */ = {
+               EB9C1DB01BDFD4DF00F89272 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               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;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
-                               MTL_ENABLE_DEBUG_INFO = YES;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
                };

-               EBB839AB1E29665E00853BAC /* Release */ = {
+               EB9C1DB11BDFD4DF00F89272 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               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;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
-                               MTL_ENABLE_DEBUG_INFO = NO;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };

-               EBBE20591C21380200B7A639 /* Debug */ = {
+               EBA9AA841CE30E58004E2B68 /* Debug */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_CXX_LIBRARY = "libc++";

-                               CLANG_ENABLE_MODULES = YES;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;


@@ -44658,14 +52036,12 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

-                               DEBUGGING_SYMBOLS = YES;
+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemnotifications/secitemnotifications.entitlements;

                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               ENABLE_TESTABILITY = YES;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_DYNAMIC_NO_PIC = NO;

-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_NO_COMMON_BLOCKS = YES;

-                               GCC_OPTIMIZATION_LEVEL = 0;

                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                        "$(inherited)",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                        "$(inherited)",


@@ -44673,21 +52049,37 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                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;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                ONLY_ACTIVE_ARCH = YES;

-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
+                               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)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };

-               EBBE205A1C21380200B7A639 /* Release */ = {
+               EBA9AA851CE30E58004E2B68 /* Release */ = {

                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_CXX_LIBRARY = "libc++";

-                               CLANG_ENABLE_MODULES = YES;

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;


@@ -44698,19 +52090,117 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

+                               CODE_SIGN_ENTITLEMENTS = RegressionTests/secitemnotifications/secitemnotifications.entitlements;

                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = 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;
                                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;
                                MTL_ENABLE_DEBUG_INFO = NO;

-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
+                               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;
+               };
+               EBB696031BE1F9DE00715F16 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               COPY_PHASE_STRIP = NO;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               PRODUCT_NAME = Security_executables_Bridge;
+                       };
+                       name = Debug;
+               };
+               EBB839AA1E29665E00853BAC /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               EBB839AB1E29665E00853BAC /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               COPY_PHASE_STRIP = NO;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               EBB851F322F7912500424FD0 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               INFOPLIST_FILE = OSX/utilities/test/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = "$(OCMOCK_RUNTIME_SEARCH_PATH)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecurityUtilitiesTests;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                       };
+                       name = Debug;
+               };
+               EBB851F422F7912500424FD0 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               ENABLE_NS_ASSERTIONS = NO;
+                               INFOPLIST_FILE = OSX/utilities/test/Info.plist;
+                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
+                               LD_RUNPATH_SEARCH_PATHS = "$(OCMOCK_RUNTIME_SEARCH_PATH)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SecurityUtilitiesTests;

                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";

+                               SKIP_INSTALL = NO;
+                               VALIDATE_PRODUCT = YES;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -44719,7 +52209,6 @@
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44735,7 +52224,6 @@
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = 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 = (
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (


@@ -44776,7 +52264,6 @@
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;


@@ -44793,7 +52280,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_NS_ASSERTIONS = NO;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;


@@ -44829,15 +52315,12 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_OBJC_ARC = 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;
                                CODE_SIGN_ENTITLEMENTS = "security-sysdiagnose/security-sysdiagnose.entitlements.plist";
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "security-sysdiagnose/security-sysdiagnose.entitlements.plist";

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/libexec;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/libexec;


@@ -44851,17 +52334,14 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_OBJC_ARC = 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;
                                CODE_SIGN_ENTITLEMENTS = "security-sysdiagnose/security-sysdiagnose.entitlements.plist";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CODE_SIGN_ENTITLEMENTS = "security-sysdiagnose/security-sysdiagnose.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/libexec;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/libexec;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -44874,12 +52354,10 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "c++98";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;


@@ -44903,7 +52381,6 @@
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;

-                               USE_HEADERMAP = NO;

                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };


@@ -44912,12 +52389,10 @@
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;

-                               CLANG_CXX_LANGUAGE_STANDARD = "c++98";

                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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_INT_CONVERSION = YES;
                                CLANG_WARN_EMPTY_BODY = YES;
                                CLANG_WARN_ENUM_CONVERSION = YES;
                                CLANG_WARN_INT_CONVERSION = YES;


@@ -44940,7 +52415,6 @@
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                RUN_CLANG_STATIC_ANALYZER = NO;
                                SUPPORTED_PLATFORMS = macosx;

-                               USE_HEADERMAP = NO;

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };


@@ -44950,12 +52424,10 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;


@@ -44971,13 +52443,11 @@
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                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;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;

-                               GCC_C_LANGUAGE_STANDARD = gnu99;

                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                MTL_ENABLE_DEBUG_INFO = NO;


@@ -44986,41 +52456,9 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               F93C49041AB8FCE00047E01A /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               F93C49051AB8FCE00047E01A /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Release;
-               };

 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */

-               05EF68B01949149C007958C3 /* Build configuration list for PBXAggregateTarget "Security_temporary_UI" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               05EF68B11949149C007958C3 /* Debug */,
-                               05EF68B21949149C007958C3 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               05EF68B619491512007958C3 /* Build configuration list for PBXAggregateTarget "Security_frameworks" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               05EF68B719491512007958C3 /* Debug */,
-                               05EF68B819491512007958C3 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                05EF68BC194915A5007958C3 /* Build configuration list for PBXAggregateTarget "Security_executables_osx" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                05EF68BC194915A5007958C3 /* Build configuration list for PBXAggregateTarget "Security_executables_osx" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45030,15 +52468,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               05EF68C2194915FB007958C3 /* Build configuration list for PBXAggregateTarget "Security_kexts" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               05EF68C3194915FB007958C3 /* Debug */,
-                               05EF68C4194915FB007958C3 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                0C0BDB43175685B000BC1A7E /* Build configuration list for PBXNativeTarget "secdtests_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                0C0BDB43175685B000BC1A7E /* Build configuration list for PBXNativeTarget "secdtests_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45102,20 +52531,29 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               0C9AEEB420783FBB00BF6237 /* Build configuration list for PBXNativeTarget "SignInAnalyticsTests_osx" */ = {
+               0CA378E323876DD100090B7E /* Build configuration list for PBXAggregateTarget "reset_account" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               0C9AEEB520783FBB00BF6237 /* Debug */,
-                               0C9AEEB620783FBB00BF6237 /* Release */,
+                               0CA378E423876DD100090B7E /* Debug */,
+                               0CA378E523876DD100090B7E /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               0CF4064D2072E3E3003D6A7F /* Build configuration list for PBXNativeTarget "SignInAnalyticsTests_ios" */ = {
+               0CCC227623F357EE00E1FCD0 /* Build configuration list for PBXNativeTarget "OctagonTrustTests" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               0CF4064E2072E3E3003D6A7F /* Debug */,
-                               0CF4064F2072E3E3003D6A7F /* Release */,
+                               0CCC227723F357EE00E1FCD0 /* Debug */,
+                               0CCC227823F357EE00E1FCD0 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               0CD743AB23C3EC8000FA0EC5 /* Build configuration list for PBXNativeTarget "OctagonTrust" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               0CD743AC23C3EC8000FA0EC5 /* Debug */,
+                               0CD743AD23C3EC8000FA0EC5 /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -45129,7 +52567,16 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               3DD1FF4A201C07F30086D049 /* Build configuration list for PBXNativeTarget "SecureTransport_macos_tests" */ = {
+               3D58394A21890FFB000ACA44 /* Build configuration list for PBXNativeTarget "SecExperimentTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               3D58394B21890FFB000ACA44 /* Debug */,
+                               3D58394C21890FFB000ACA44 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               3DD1FF4A201C07F30086D049 /* Build configuration list for PBXNativeTarget "SecureTransportTests_macos" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                3DD1FF4B201C07F30086D049 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                3DD1FF4B201C07F30086D049 /* Debug */,


@@ -45138,7 +52585,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               3DD1FFCD201FDB1D0086D049 /* Build configuration list for PBXNativeTarget "SecureTransport_ios_tests" */ = {
+               3DD1FFCD201FDB1D0086D049 /* Build configuration list for PBXNativeTarget "SecureTransportTests_ios" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                3DD1FFCE201FDB1D0086D049 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                3DD1FFCE201FDB1D0086D049 /* Debug */,


@@ -45147,6 +52594,24 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               3E4D49B92531170600B124B3 /* Build configuration list for PBXNativeTarget "secsecstaticcodeapitest" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               3E4D49BA2531170600B124B3 /* Debug */,
+                               3E4D49BB2531170600B124B3 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               3E88360E24F068EF00E9F4D6 /* Build configuration list for PBXNativeTarget "secseccodeapitest" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               3E88360F24F068EF00E9F4D6 /* Debug */,
+                               3E88361024F068EF00E9F4D6 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                438169381B4EDCBD00C54D58 /* Build configuration list for PBXNativeTarget "SOSCCAuthPlugin" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                438169381B4EDCBD00C54D58 /* Build configuration list for PBXNativeTarget "SOSCCAuthPlugin" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45183,7 +52648,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests_ios" */ = {
+               4727FBC31F9918590003AE36 /* Build configuration list for PBXNativeTarget "secdxctests" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4727FBBC1F9918590003AE36 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4727FBBC1F9918590003AE36 /* Debug */,


@@ -45219,15 +52684,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               478D42991FD72A8100CAB645 /* Build configuration list for PBXNativeTarget "secdxctests_mac" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               478D429A1FD72A8100CAB645 /* Debug */,
-                               478D429B1FD72A8100CAB645 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                47C2F1872059CB690062DE30 /* Build configuration list for PBXNativeTarget "KeychainResources" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                47C2F1872059CB690062DE30 /* Build configuration list for PBXNativeTarget "KeychainResources" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45246,15 +52702,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               4809F7AC2061B697003E72D0 /* Build configuration list for PBXAggregateTarget "MultiPeerSimulatorTests" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               4809F7A52061B697003E72D0 /* Debug */,
-                               4809F7A62061B697003E72D0 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                4C32C0B10A4975F7002891BD /* Build configuration list for PBXNativeTarget "Security_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                4C32C0B10A4975F7002891BD /* Build configuration list for PBXNativeTarget "Security_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45282,15 +52729,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               4C541FA20F250C8C00E508AE /* Build configuration list for PBXAggregateTarget "phase1" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               4C541F980F250C3000E508AE /* Debug */,
-                               4C541F9B0F250C3000E508AE /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                4C541FA30F250C8C00E508AE /* Build configuration list for PBXAggregateTarget "Security_executables_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                4C541FA30F250C8C00E508AE /* Build configuration list for PBXAggregateTarget "Security_executables_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45309,7 +52747,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               4C91274A0ADBF4A100AF202E /* Build configuration list for PBXAggregateTarget "ios" */ = {
+               4C91274A0ADBF4A100AF202E /* Build configuration list for PBXAggregateTarget "Security_all_ios" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                792EFFE60CBBF878007C00A0 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                792EFFE60CBBF878007C00A0 /* Debug */,


@@ -45363,6 +52801,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               5A442F8D233C330F00918373 /* Build configuration list for PBXNativeTarget "experimentTool" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               5A442F8E233C330F00918373 /* Debug */,
+                               5A442F8F233C330F00918373 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                5E10994D19A5E55800A60E2B /* Build configuration list for PBXNativeTarget "ISACLProtectedItems" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                5E10994D19A5E55800A60E2B /* Build configuration list for PBXNativeTarget "ISACLProtectedItems" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45381,6 +52828,24 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               6C2045EE2424BA7F00F9461D /* Build configuration list for PBXNativeTarget "KeychainStasher" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               6C2045EF2424BA7F00F9461D /* Debug */,
+                               6C2045F02424BA7F00F9461D /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               6C39237621F13E4D00D018AD /* Build configuration list for PBXNativeTarget "SecDbBackupTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               6C39237721F13E4D00D018AD /* Debug */,
+                               6C39237821F13E4D00D018AD /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                6C4605B51F882B9B001421B6 /* Build configuration list for PBXNativeTarget "KeychainAnalyticsTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45390,20 +52855,20 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               6C98085E1E788AEB00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_mac" */ = {
+               6C7BE2E423C3DD64003BB2CA /* Build configuration list for PBXNativeTarget "securitytool_bridge" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               6C98085F1E788AEB00E70590 /* Debug */,
-                               6C9808601E788AEB00E70590 /* Release */,
+                               6C7BE2E523C3DD64003BB2CA /* Debug */,
+                               6C7BE2E623C3DD64003BB2CA /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               6C98089A1E788AFD00E70590 /* Build configuration list for PBXNativeTarget "CKKSCloudKitTests_ios" */ = {
+               6C963288242A279B00C53CE2 /* Build configuration list for PBXNativeTarget "stashtester" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               6C98089B1E788AFD00E70590 /* Debug */,
-                               6C98089C1E788AFD00E70590 /* Release */,
+                               6C963285242A279B00C53CE2 /* Debug */,
+                               6C963286242A279B00C53CE2 /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -45435,7 +52900,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               6CF4A0CC1E45488B00ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp_mac" */ = {
+               6CF4A0CC1E45488B00ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                6CF4A0C51E45488B00ECD7B5 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                6CF4A0C51E45488B00ECD7B5 /* Debug */,


@@ -45444,15 +52909,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               6CF4A0F41E4549F300ECD7B5 /* Build configuration list for PBXNativeTarget "KeychainEntitledTestApp_ios" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               6CF4A0F51E4549F300ECD7B5 /* Debug */,
-                               6CF4A0F61E4549F300ECD7B5 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45498,6 +52954,33 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               BEAA003E202A832500E51F45 /* Build configuration list for PBXNativeTarget "TrustedPeersHelper" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               BEAA0037202A832500E51F45 /* Debug */,
+                               BEAA0038202A832500E51F45 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               BEAA0041202B728B00E51F45 /* Build configuration list for PBXAggregateTarget "Security_executables_Swift" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               BEAA0042202B728B00E51F45 /* Debug */,
+                               BEAA0043202B728B00E51F45 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               BECFA43920F91AFE00B11002 /* Build configuration list for PBXNativeTarget "tppolicy" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               BECFA43220F91AFE00B11002 /* Debug */,
+                               BECFA43320F91AFE00B11002 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                BED208DA1EDF950E00753952 /* Build configuration list for PBXNativeTarget "manifeststresstest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                BED208DA1EDF950E00753952 /* Build configuration list for PBXNativeTarget "manifeststresstest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45507,6 +52990,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               BED987DB2099145400607A5F /* Build configuration list for PBXNativeTarget "TrustedPeersHelperUnitTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               BED987DC2099145400607A5F /* Debug */,
+                               BED987DD2099145400607A5F /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                BEF88C421EAFFC4000357577 /* Build configuration list for PBXNativeTarget "TrustedPeers" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                BEF88C421EAFFC4000357577 /* Build configuration list for PBXNativeTarget "TrustedPeers" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45552,6 +53044,105 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               D42C839921159147008D3D83 /* Build configuration list for PBXNativeTarget "security_cms" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D42C839A21159147008D3D83 /* Debug */,
+                               D42C839B21159147008D3D83 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D44D1F6E2115893000E76E1A /* Build configuration list for PBXNativeTarget "CMS" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D44D1F672115893000E76E1A /* Debug */,
+                               D44D1F682115893000E76E1A /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D453A4BD2122236D00850A26 /* Build configuration list for PBXNativeTarget "TrustTests_macos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D453A4BE2122236D00850A26 /* Debug */,
+                               D453A4BF2122236D00850A26 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D458C4F4214E1DE10043D982 /* Build configuration list for PBXNativeTarget "TrustTestsRunner_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D458C4F5214E1DE10043D982 /* Debug */,
+                               D458C4F6214E1DE10043D982 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D458C50D214E20540043D982 /* Build configuration list for PBXNativeTarget "TrustTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D458C50E214E20540043D982 /* Debug */,
+                               D458C50F214E20540043D982 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4707A0A21136E6A005BCFDA /* Build configuration list for PBXNativeTarget "TrustTests_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4707A0B21136E6A005BCFDA /* Debug */,
+                               D4707A0C21136E6A005BCFDA /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D477EE5D21ED476D00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_bridge" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D477EE5E21ED476D00C9AAFF /* Debug */,
+                               D477EE5F21ED476D00C9AAFF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D477EE6121ED477C00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_tvos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D477EE6221ED477C00C9AAFF /* Debug */,
+                               D477EE6321ED477C00C9AAFF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D477EE6521ED479500C9AAFF /* Build configuration list for PBXAggregateTarget "Security_tests_watchos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D477EE6621ED479500C9AAFF /* Debug */,
+                               D477EE6721ED479500C9AAFF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D477EE6921ED47C600C9AAFF /* Build configuration list for PBXAggregateTarget "Security_executables_darwinos_only_osx" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D477EE6A21ED47C600C9AAFF /* Debug */,
+                               D477EE6B21ED47C600C9AAFF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D477EE6D21ED47DB00C9AAFF /* Build configuration list for PBXAggregateTarget "Security_executables_darwinos_only_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D477EE6E21ED47DB00C9AAFF /* Debug */,
+                               D477EE6F21ED47DB00C9AAFF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                D4ADA31A1E2B41670031CEA3 /* Build configuration list for PBXNativeTarget "libtrustd" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                D4ADA31A1E2B41670031CEA3 /* Build configuration list for PBXNativeTarget "libtrustd" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45561,6 +53152,132 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               D4D1D3FE21AD0B3F0012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_watchos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4D1D3FF21AD0B3F0012C66C /* Debug */,
+                               D4D1D40021AD0B3F0012C66C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4D1D40321AD0B4B0012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_tvos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4D1D40421AD0B4B0012C66C /* Debug */,
+                               D4D1D40521AD0B4B0012C66C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4D1D40A21ADC9720012C66C /* Build configuration list for PBXAggregateTarget "Security_executables_core_osx" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4D1D40B21ADC9720012C66C /* Debug */,
+                               D4D1D40C21ADC9720012C66C /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4D1FDDD21165F8B003538E2 /* Build configuration list for PBXNativeTarget "security_cms_regressions" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4D1FDDE21165F8B003538E2 /* Debug */,
+                               D4D1FDDF21165F8B003538E2 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F47B3922270B6F003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_watchos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F47B3A22270B6F003483E9 /* Debug */,
+                               D4F47B3B22270B6F003483E9 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F47B3D22270B8A003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_tvos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F47B3E22270B8A003483E9 /* Debug */,
+                               D4F47B3F22270B8A003483E9 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F47B4122270B97003483E9 /* Build configuration list for PBXAggregateTarget "Security_all_bridge" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F47B4222270B97003483E9 /* Debug */,
+                               D4F47B4322270B97003483E9 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56B8B217FA32000FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_executables_core_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56B87217FA32000FCA6B7 /* Debug */,
+                               D4F56B88217FA32000FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56B8E217FA3F800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_frameworks_tvos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56B8F217FA3F800FCA6B7 /* Debug */,
+                               D4F56B90217FA3F800FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56B92217FA40800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_frameworks_watchos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56B93217FA40800FCA6B7 /* Debug */,
+                               D4F56B94217FA40800FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56BC321813EC900FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_osx" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56BC421813EC900FCA6B7 /* Debug */,
+                               D4F56BC521813EC900FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56BC721813ECF00FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56BC821813ECF00FCA6B7 /* Debug */,
+                               D4F56BC921813ECF00FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56BCB21813EDC00FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_tvos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56BCC21813EDC00FCA6B7 /* Debug */,
+                               D4F56BCD21813EDC00FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               D4F56BCF21813EE800FCA6B7 /* Build configuration list for PBXAggregateTarget "Security_internal_watchos" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               D4F56BD021813EE800FCA6B7 /* Debug */,
+                               D4F56BD121813EE800FCA6B7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DA30D6801DF8C8FB00EC6B43 /* Build configuration list for PBXNativeTarget "KeychainSyncAccountUpdater" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DA30D6801DF8C8FB00EC6B43 /* Build configuration list for PBXNativeTarget "KeychainSyncAccountUpdater" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45570,6 +53287,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DA41FE152241ADC000838FB3 /* Build configuration list for PBXNativeTarget "otpaird" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DA41FE122241ADC000838FB3 /* Debug */,
+                               DA41FE132241ADC000838FB3 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DAE40BCB20CF3E46002D5674 /* Build configuration list for PBXNativeTarget "secitemcanarytest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DAE40BCB20CF3E46002D5674 /* Build configuration list for PBXNativeTarget "secitemcanarytest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45606,6 +53332,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DC05037F21409A4100A8EDB7 /* Build configuration list for PBXNativeTarget "OCMockUmbrella" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DC05037B21409A4100A8EDB7 /* Debug */,
+                               DC05037C21409A4100A8EDB7 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DC0BC55D1D8B6D2E00070CB0 /* Build configuration list for PBXNativeTarget "XPCKeychainSandboxCheck" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DC0BC55D1D8B6D2E00070CB0 /* Build configuration list for PBXNativeTarget "XPCKeychainSandboxCheck" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45804,6 +53539,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DC0EF8F3208697C700AB9E95 /* Build configuration list for PBXNativeTarget "tpctl" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DC0EF8F4208697C700AB9E95 /* Debug */,
+                               DC0EF8F5208697C700AB9E95 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DC17890D1D77980500B50D50 /* Build configuration list for PBXNativeTarget "Security_osx" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45813,11 +53557,11 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               DC222C741E034D1F00B09171 /* Build configuration list for PBXNativeTarget "libsecurityd_ios_NO_AKS" */ = {
+               DC311E742124B8A8002F5EAE /* Build configuration list for PBXNativeTarget "aks_real_witness" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               DC222C751E034D1F00B09171 /* Debug */,
-                               DC222C761E034D1F00B09171 /* Release */,
+                               DC311E752124B8A8002F5EAE /* Debug */,
+                               DC311E762124B8A8002F5EAE /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -45831,6 +53575,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DC36895F21235F42003A3735 /* Build configuration list for PBXNativeTarget "aks_mock" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DC36896021235F42003A3735 /* Debug */,
+                               DC36896121235F42003A3735 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DC3A4B5B1D91E9FB00E46D4A /* Build configuration list for PBXNativeTarget "CodeSigningHelper" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DC3A4B5B1D91E9FB00E46D4A /* Build configuration list for PBXNativeTarget "CodeSigningHelper" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -45858,24 +53611,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               DC52EA491D80CB7000B0A59C /* Build configuration list for PBXNativeTarget "SecurityTool" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC52EA4A1D80CB7000B0A59C /* Debug */,
-                               DC52EA4B1D80CB7000B0A59C /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               DC52EBD21D80CEF100B0A59C /* Build configuration list for PBXNativeTarget "SecurityCommands" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               DC52EBD31D80CEF100B0A59C /* Debug */,
-                               DC52EBD41D80CEF100B0A59C /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                DC52EC311D80CFB200B0A59C /* Build configuration list for PBXNativeTarget "SOSCommands" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DC52EC311D80CFB200B0A59C /* Build configuration list for PBXNativeTarget "SOSCommands" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46074,11 +53809,20 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               DC71D9DC1D95BA6C0065FB93 /* Build configuration list for PBXNativeTarget "ASN1" */ = {
+               DC6D1C75208A547400AB21AF /* Build configuration list for PBXAggregateTarget "Security_frameworks_bridge" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DC6D1C76208A547400AB21AF /* Debug */,
+                               DC6D1C77208A547400AB21AF /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               DC7FC44C21EE914D003C39B8 /* Build configuration list for PBXNativeTarget "FeatureFlagsPlist" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               DC71D9DD1D95BA6C0065FB93 /* Debug */,
-                               DC71D9DE1D95BA6C0065FB93 /* Release */,
+                               DC7FC44D21EE914D003C39B8 /* Debug */,
+                               DC7FC44E21EE914D003C39B8 /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -46101,7 +53845,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               DC8834051D8A218F00CE0ACA /* Build configuration list for PBXNativeTarget "ASN1_not_installed" */ = {
+               DC8834051D8A218F00CE0ACA /* Build configuration list for PBXNativeTarget "ASN1" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                DC8834061D8A218F00CE0ACA /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                DC8834061D8A218F00CE0ACA /* Debug */,


@@ -46191,6 +53935,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DC99B88F20EACA470065B73B /* Build configuration list for PBXNativeTarget "OctagonTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DC99B89020EACA470065B73B /* Debug */,
+                               DC99B89120EACA470065B73B /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DCB3406A1D8A24DF0054D16E /* Build configuration list for PBXNativeTarget "security_authorization" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DCB3406A1D8A24DF0054D16E /* Build configuration list for PBXNativeTarget "security_authorization" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46245,6 +53998,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DCBF4ADD21FFC82100539F0A /* Build configuration list for PBXNativeTarget "SecEscrowRequestTests" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DCBF4ADE21FFC82100539F0A /* Debug */,
+                               DCBF4ADF21FFC82100539F0A /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DCC78EAF1D8088E200865A7C /* Build configuration list for PBXNativeTarget "security" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DCC78EAF1D8088E200865A7C /* Build configuration list for PBXNativeTarget "security" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46371,6 +54133,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DCDA5E542124B9C6009B11B2 /* Build configuration list for PBXAggregateTarget "aks_support" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DCDA5E502124B9C6009B11B2 /* Debug */,
+                               DCDA5E512124B9C6009B11B2 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DCE4E6A11D7A37FA00AFB96E /* Build configuration list for PBXNativeTarget "security2tool_macos" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DCE4E6A11D7A37FA00AFB96E /* Build configuration list for PBXNativeTarget "security2tool_macos" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46443,6 +54214,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               DCF216DC21ADD5B10029CCC1 /* Build configuration list for PBXNativeTarget "protobuf_source_generation" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               DCF216D821ADD5B10029CCC1 /* Debug */,
+                               DCF216D921ADD5B10029CCC1 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                DCF782BB1D88B44300E694BB /* Build configuration list for PBXLegacyTarget "==== macOS Libraries ======" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                DCF782BB1D88B44300E694BB /* Build configuration list for PBXLegacyTarget "==== macOS Libraries ======" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46515,6 +54295,33 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

+               E060D1CA212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarnessXPCServiceProtocol" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               E060D1CB212478120025B833 /* Debug */,
+                               E060D1CC212478120025B833 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               E060D1CD212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarnessXPCService" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               E060D1CE212478120025B833 /* Debug */,
+                               E060D1CF212478120025B833 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               E060D1D2212478120025B833 /* Build configuration list for PBXNativeTarget "OctagonTestHarness" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               E060D1D3212478120025B833 /* Debug */,
+                               E060D1D4212478120025B833 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };

                E710C75C1331946500F85568 /* Build configuration list for PBXNativeTarget "SecurityTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                E710C75C1331946500F85568 /* Build configuration list for PBXNativeTarget "SecurityTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46524,7 +54331,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               E74584671BF68EBA001B54A4 /* Build configuration list for PBXAggregateTarget "osx" */ = {
+               E74584671BF68EBA001B54A4 /* Build configuration list for PBXAggregateTarget "Security_all_osx" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                                E74584681BF68EBA001B54A4 /* Debug */,
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                E74584681BF68EBA001B54A4 /* Debug */,


@@ -46560,15 +54367,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               E79EEDE11CD4000C00C2FBFC /* Build configuration list for PBXAggregateTarget "Security_executables" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               E79EEDE21CD4000C00C2FBFC /* Debug */,
-                               E79EEDE31CD4000C00C2FBFC /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                E7B01BEF166594AB000485F1 /* Build configuration list for PBXNativeTarget "SyncDevTest2" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                E7B01BEF166594AB000485F1 /* Build configuration list for PBXNativeTarget "SyncDevTest2" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46605,24 +54403,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               EB056E4E1FE5E391000A771E /* Build configuration list for PBXNativeTarget "DeviceSimulator" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               EB056E471FE5E391000A771E /* Debug */,
-                               EB056E481FE5E391000A771E /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
-               EB05C4FD1FE5E48B00D68712 /* Build configuration list for PBXNativeTarget "MultiDeviceSimulatorTests" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               EB05C4F61FE5E48B00D68712 /* Debug */,
-                               EB05C4F71FE5E48B00D68712 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

                EB0BC93B1C3C791500785842 /* Build configuration list for PBXNativeTarget "secedumodetest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                EB0BC93B1C3C791500785842 /* Build configuration list for PBXNativeTarget "secedumodetest" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (


@@ -46704,12 +54484,11 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               EB6A6FA91B90F83A0045DC68 /* Build configuration list for PBXAggregateTarget "phase1_ios" */ = {
+               EB6952B6223B75C300F02C1C /* Build configuration list for PBXNativeTarget "secitemd" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               EB6A6FAA1B90F83A0045DC68 /* Release */,
-                               EB6A6FAB1B90F83A0045DC68 /* Release */,
-                               EBB696041BE1F9DE00715F16 /* Debug */,
+                               EB6952B7223B75C300F02C1C /* Debug */,
+                               EB6952B8223B75C300F02C1C /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -46724,11 +54503,29 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               EB6A6FB51B90F8C90045DC68 /* Build configuration list for PBXAggregateTarget "phase2" */ = {
+               EB74CC1A2207E48100F1BBAD /* Build configuration list for PBXNativeTarget "KeychainSettings" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               EB74CC1B2207E48100F1BBAD /* Debug */,
+                               EB74CC1C2207E48100F1BBAD /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               EB7E90F22193F90800B1FA21 /* Build configuration list for PBXAggregateTarget "Build C2 Metrics" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               EB7E90F32193F90800B1FA21 /* Debug */,
+                               EB7E90F42193F90800B1FA21 /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               EB89088321F17D3C00F0DDDB /* Build configuration list for PBXNativeTarget "recovery_securityd" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               EB6A6FB61B90F8C90045DC68 /* Debug */,
-                               EB6A6FB71B90F8C90045DC68 /* Release */,
+                               EB89088421F17D3C00F0DDDB /* Debug */,
+                               EB89088521F17D3C00F0DDDB /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -46769,11 +54566,11 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               EBBE20581C21380200B7A639 /* Build configuration list for PBXLegacyTarget "SecurityFeatures" */ = {
+               EBB8520822F7912500424FD0 /* Build configuration list for PBXNativeTarget "SecurityUtilitiesTests" */ = {

                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (

-                               EBBE20591C21380200B7A639 /* Debug */,
-                               EBBE205A1C21380200B7A639 /* Release */,
+                               EBB851F322F7912500424FD0 /* Debug */,
+                               EBB851F422F7912500424FD0 /* Release */,

                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;


@@ -46814,15 +54611,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };

-               F93C49031AB8FCE00047E01A /* Build configuration list for PBXAggregateTarget "ckcdiagnose.sh" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               F93C49041AB8FCE00047E01A /* Debug */,
-                               F93C49051AB8FCE00047E01A /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };

 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */
 /* End XCConfigurationList section */
 
 /* Begin XCVersionGroup section */


@@ -46836,6 +54624,17 @@
                        sourceTree = "<group>";
                        versionGroupType = wrapper.xcdatamodel;
                };
                        sourceTree = "<group>";
                        versionGroupType = wrapper.xcdatamodel;
                };

+               BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */ = {
+                       isa = XCVersionGroup;
+                       children = (
+                               DC3B222C22C408BE006D915C /* TrustedPeersHelper_2.xcdatamodel */,
+                               BE92249D204F203C0052E828 /* TrustedPeersHelper.xcdatamodel */,
+                       );
+                       currentVersion = DC3B222C22C408BE006D915C /* TrustedPeersHelper_2.xcdatamodel */;
+                       path = TrustedPeersHelper.xcdatamodeld;
+                       sourceTree = "<group>";
+                       versionGroupType = wrapper.xcdatamodel;
+               };

 /* End XCVersionGroup section */
        };
        rootObject = 4C35DB69094F906D002917C4 /* Project object */;
 /* End XCVersionGroup section */
        };
        rootObject = 4C35DB69094F906D002917C4 /* Project object */;