]> git.saurik.com Git - apple/security.git/blobdiff - Security.xcodeproj/project.pbxproj
projects / apple / security.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Security-59754.41.1.tar.gz
[apple/security.git] / Security.xcodeproj / project.pbxproj
diff --git a/Security.xcodeproj/project.pbxproj b/Security.xcodeproj/project.pbxproj
index d469fbf5f1a05a23ebe341bc7d128e7f310c6750..6ccf9ee997df6aa4be37477d805a5fe41de29e57 100644 (file)
--- a/Security.xcodeproj/project.pbxproj
+++ b/Security.xcodeproj/project.pbxproj
@@ -13,7 +13,9 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               6C2045F82424BC4400F9461D /* PBXTargetDependency */,
                                47C2F1902059CBFC0062DE30 /* PBXTargetDependency */,
                                47C2F1902059CBFC0062DE30 /* PBXTargetDependency */,
+                               DCE27861245B81BD00381FE8 /* PBXTargetDependency */,
                                D469C4E5218BECCE008AC1FC /* PBXTargetDependency */,
                                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */,
                                EB27FF261E40716D00EC9E3A /* PBXTargetDependency */,
                                D469C4E5218BECCE008AC1FC /* PBXTargetDependency */,
                                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */,
                                EB27FF261E40716D00EC9E3A /* PBXTargetDependency */,
@@ -52,6 +54,7 @@
                                EB6A6FBD1B90F9170045DC68 /* PBXTargetDependency */,
                                DC647C46208A85C900D0F9F8 /* PBXTargetDependency */,
                                D4F56BAB217FCAF600FCA6B7 /* PBXTargetDependency */,
                                EB6A6FBD1B90F9170045DC68 /* PBXTargetDependency */,
                                DC647C46208A85C900D0F9F8 /* PBXTargetDependency */,
                                D4F56BAB217FCAF600FCA6B7 /* PBXTargetDependency */,
+                               0C65BB4F23C3F3270063D2B7 /* PBXTargetDependency */,
                        );
                        name = Security_frameworks_ios;
                        productName = kernel;
                        );
                        name = Security_frameworks_ios;
                        productName = kernel;
@@ -73,6 +76,7 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               5AAE383623D261CF0025CF9E /* PBXTargetDependency */,
                                EB74CC232207E99700F1BBAD /* PBXTargetDependency */,
                                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */,
                                4771D982209A76B100BA9772 /* PBXTargetDependency */,
                                EB74CC232207E99700F1BBAD /* PBXTargetDependency */,
                                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */,
                                4771D982209A76B100BA9772 /* PBXTargetDependency */,
@@ -177,8 +181,9 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               0CCC22D223F39A7500E1FCD0 /* PBXTargetDependency */,
+                               6CF33CA62387156600D1E75D /* PBXTargetDependency */,
                                EB694E87223AB79400F02C1C /* PBXTargetDependency */,
                                EB694E87223AB79400F02C1C /* PBXTargetDependency */,
-                               D4E0E9762224DE9100A802E0 /* PBXTargetDependency */,
                                D4E0E9702224DE8200A802E0 /* PBXTargetDependency */,
                                D4E0E9722224DE8200A802E0 /* PBXTargetDependency */,
                                D4E0E9742224DE8200A802E0 /* PBXTargetDependency */,
                                D4E0E9702224DE8200A802E0 /* PBXTargetDependency */,
                                D4E0E9722224DE8200A802E0 /* PBXTargetDependency */,
                                D4E0E9742224DE8200A802E0 /* PBXTargetDependency */,
@@ -208,8 +213,9 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               0CCC22D423F39A7C00E1FCD0 /* PBXTargetDependency */,
+                               6CF33CA82387157200D1E75D /* PBXTargetDependency */,
                                EB694E72223AB78E00F02C1C /* PBXTargetDependency */,
                                EB694E72223AB78E00F02C1C /* PBXTargetDependency */,
-                               D4E0E9AC2224DFEB00A802E0 /* PBXTargetDependency */,
                                D4E0E9A62224DFDD00A802E0 /* PBXTargetDependency */,
                                D4E0E9A82224DFDD00A802E0 /* PBXTargetDependency */,
                                D4E0E9AA2224DFDD00A802E0 /* PBXTargetDependency */,
                                D4E0E9A62224DFDD00A802E0 /* PBXTargetDependency */,
                                D4E0E9A82224DFDD00A802E0 /* PBXTargetDependency */,
                                D4E0E9AA2224DFDD00A802E0 /* PBXTargetDependency */,
@@ -359,6 +365,7 @@
                                D4F56B9D217FCA7E00FCA6B7 /* PBXTargetDependency */,
                                D4F56B9F217FCA8600FCA6B7 /* PBXTargetDependency */,
                                D4F56BB72181380600FCA6B7 /* PBXTargetDependency */,
                                D4F56B9D217FCA7E00FCA6B7 /* PBXTargetDependency */,
                                D4F56B9F217FCA8600FCA6B7 /* PBXTargetDependency */,
                                D4F56BB72181380600FCA6B7 /* PBXTargetDependency */,
+                               0C2B36C523C42EC800000718 /* PBXTargetDependency */,
                        );
                        name = Security_frameworks_tvos;
                        productName = Security_frameworks_tvos;
                        );
                        name = Security_frameworks_tvos;
                        productName = Security_frameworks_tvos;
@@ -372,6 +379,7 @@
                                D4F56BA7217FCAB000FCA6B7 /* PBXTargetDependency */,
                                D4F56BA5217FCAAA00FCA6B7 /* PBXTargetDependency */,
                                D4F56BBB2181387600FCA6B7 /* PBXTargetDependency */,
                                D4F56BA7217FCAB000FCA6B7 /* PBXTargetDependency */,
                                D4F56BA5217FCAAA00FCA6B7 /* PBXTargetDependency */,
                                D4F56BBB2181387600FCA6B7 /* PBXTargetDependency */,
+                               0C2B36C323C42EBC00000718 /* PBXTargetDependency */,
                        );
                        name = Security_frameworks_watchos;
                        productName = Security_frameworks_watchos;
                        );
                        name = Security_frameworks_watchos;
                        productName = Security_frameworks_watchos;
@@ -621,6 +629,9 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               0CCC22D023F39A6A00E1FCD0 /* PBXTargetDependency */,
+                               6CC638FE2266AE0A00E5DB0B /* PBXTargetDependency */,
+                               6CC639002266AE0A00E5DB0B /* PBXTargetDependency */,
                                EB694E8B223AB7A200F02C1C /* PBXTargetDependency */,
                                EB694DD0223A087700F02C1C /* PBXTargetDependency */,
                                EB694DC82239E5F200F02C1C /* PBXTargetDependency */,
                                EB694E8B223AB7A200F02C1C /* PBXTargetDependency */,
                                EB694DD0223A087700F02C1C /* PBXTargetDependency */,
                                EB694DC82239E5F200F02C1C /* PBXTargetDependency */,
@@ -639,8 +650,6 @@
                                D4A763E32224BDF90063B2B9 /* PBXTargetDependency */,
                                D4A763E12224BDED0063B2B9 /* PBXTargetDependency */,
                                D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */,
                                D4A763E32224BDF90063B2B9 /* PBXTargetDependency */,
                                D4A763E12224BDED0063B2B9 /* PBXTargetDependency */,
                                D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */,
-                               D4A763DD2224BDCC0063B2B9 /* PBXTargetDependency */,
-                               D4A763DB2224BDAB0063B2B9 /* PBXTargetDependency */,
                                D4A763D92224BD990063B2B9 /* PBXTargetDependency */,
                                D4A763D52224BD6F0063B2B9 /* PBXTargetDependency */,
                                D4A763D32224BD640063B2B9 /* PBXTargetDependency */,
                                D4A763D92224BD990063B2B9 /* PBXTargetDependency */,
                                D4A763D52224BD6F0063B2B9 /* PBXTargetDependency */,
                                D4A763D32224BD640063B2B9 /* PBXTargetDependency */,
@@ -652,9 +661,10 @@
                                D477EE7B21ED48C000C9AAFF /* PBXTargetDependency */,
                                D477EE7D21ED48CB00C9AAFF /* PBXTargetDependency */,
                                D477EE7F21ED48D500C9AAFF /* PBXTargetDependency */,
                                D477EE7B21ED48C000C9AAFF /* PBXTargetDependency */,
                                D477EE7D21ED48CB00C9AAFF /* PBXTargetDependency */,
                                D477EE7F21ED48D500C9AAFF /* PBXTargetDependency */,
-                               D477EE8321ED48E800C9AAFF /* PBXTargetDependency */,
                                D477EE8121ED48DF00C9AAFF /* PBXTargetDependency */,
                                EBB8521022F793A200424FD0 /* 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;
@@ -665,13 +675,14 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               0CCC22CE23F39A6300E1FCD0 /* PBXTargetDependency */,
+                               6C2D797522C06CEF00C3CE32 /* PBXTargetDependency */,
+                               6C2D797322C06CEB00C3CE32 /* PBXTargetDependency */,
                                EB694E89223AB79B00F02C1C /* PBXTargetDependency */,
                                EB694DCE223A086C00F02C1C /* PBXTargetDependency */,
                                EB694DC42239E5A200F02C1C /* PBXTargetDependency */,
                                EB694E89223AB79B00F02C1C /* PBXTargetDependency */,
                                EB694DCE223A086C00F02C1C /* PBXTargetDependency */,
                                EB694DC42239E5A200F02C1C /* PBXTargetDependency */,
-                               D4E0E97A2224DEE600A802E0 /* PBXTargetDependency */,
                                D45D8F882224DC3F00D6C124 /* PBXTargetDependency */,
                                D45D8F862224DBF800D6C124 /* PBXTargetDependency */,
                                D45D8F882224DC3F00D6C124 /* PBXTargetDependency */,
                                D45D8F862224DBF800D6C124 /* PBXTargetDependency */,
-                               D45D8F842224DBEF00D6C124 /* PBXTargetDependency */,
                                D45D8F822224DBE300D6C124 /* PBXTargetDependency */,
                                D45D8F7E2224DBD900D6C124 /* PBXTargetDependency */,
                                D45D8F7C2224DBC600D6C124 /* PBXTargetDependency */,
                                D45D8F822224DBE300D6C124 /* PBXTargetDependency */,
                                D45D8F7E2224DBD900D6C124 /* PBXTargetDependency */,
                                D45D8F7C2224DBC600D6C124 /* PBXTargetDependency */,
@@ -692,7 +703,6 @@
                                EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */,
                                EB10557D1E14DFB60003C309 /* PBXTargetDependency */,
                                BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */,
                                EB58A0621E74C8E4009C10D7 /* PBXTargetDependency */,
                                EB10557D1E14DFB60003C309 /* PBXTargetDependency */,
                                BE9C38D31EB11605007E2AE1 /* PBXTargetDependency */,
-                               47D991D020407F7E0078CAE2 /* PBXTargetDependency */,
                                EBB8521222F793AC00424FD0 /* PBXTargetDependency */,
                        );
                        name = Security_tests_ios;
                                EBB8521222F793AC00424FD0 /* PBXTargetDependency */,
                        );
                        name = Security_tests_ios;
@@ -708,6 +718,7 @@
                                DC647C44208A85BE00D0F9F8 /* PBXTargetDependency */,
                                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */,
                                D4F56BB32181306900FCA6B7 /* PBXTargetDependency */,
                                DC647C44208A85BE00D0F9F8 /* PBXTargetDependency */,
                                DC58C4431D77C1F8003C25A4 /* PBXTargetDependency */,
                                D4F56BB32181306900FCA6B7 /* PBXTargetDependency */,
+                               0C65BB4D23C3F31B0063D2B7 /* PBXTargetDependency */,
                        );
                        name = Security_frameworks_osx;
                        productName = Security_frameworks_macos;
                        );
                        name = Security_frameworks_osx;
                        productName = Security_frameworks_macos;
@@ -729,6 +740,7 @@
                        buildPhases = (
                        );
                        dependencies = (
                        buildPhases = (
                        );
                        dependencies = (
+                               6C7BE2EA23C3DD9C003BB2CA /* PBXTargetDependency */,
                                47455B24205B3E2F008FE980 /* PBXTargetDependency */,
                                D41257F71E941E9600781F23 /* PBXTargetDependency */,
                        );
                                47455B24205B3E2F008FE980 /* PBXTargetDependency */,
                                D41257F71E941E9600781F23 /* PBXTargetDependency */,
                        );
@@ -771,11 +783,11 @@
                091B39732063B67700ECAB6F /* RemoteServiceDiscovery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */; };
                0940F6F82151316500C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                0940F6F92151316600C06F18 /* libACM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC610A3A1D78F228002223DE /* libACM.a */; };
                091B39732063B67700ECAB6F /* RemoteServiceDiscovery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 091B396D2063B64A00ECAB6F /* RemoteServiceDiscovery.framework */; };
                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 */; };
-               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 */; };
                0C00FC86217A980100C8BF00 /* OTLocalCuttlefishReset.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C00FC81217A971800C8BF00 /* OTLocalCuttlefishReset.m */; };
                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 */; };
                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 */; };
                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 */; };
@@ -786,13 +798,18 @@
                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                0C0C4F86216FB73C00C14C61 /* EscrowKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F83216FB55600C14C61 /* EscrowKeys.swift */; };
                0C0C4F87216FB73F00C14C61 /* BottledPeer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0C4F84216FB56B00C14C61 /* BottledPeer.swift */; };
                0C0BDB931756A8C900BC1A7E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E71F3E3016EA69A900FAF9B4 /* SystemConfiguration.framework */; };
                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 */; };
                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 */; };
                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 */; };
                0C1637271FD2065400210823 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
                0C16371C1FD116B300210823 /* MockCloudKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3502E61E0214C800BC0587 /* MockCloudKit.m */; };
                0C1637271FD2065400210823 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
                0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */ = {isa = PBXBuildFile; fileRef = 476541641F339F6300413F65 /* SecdWatchdog.m */; };
@@ -802,6 +819,8 @@
                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 */; };
                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 */; };
@@ -814,50 +833,72 @@
                0C2BCBCF1D0648EF00ED7A2F /* dtlsEchoServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C2BCBA61D063F7D00ED7A2F /* dtlsEchoServer.c */; };
                0C2F337220DD64930031A92D /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F337120DD647D0031A92D /* OTRamping.m */; };
                0C2F337320DD64940031A92D /* OTRamping.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C2F337120DD647D0031A92D /* OTRamping.m */; };
                0C2BCBCF1D0648EF00ED7A2F /* dtlsEchoServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C2BCBA61D063F7D00ED7A2F /* dtlsEchoServer.c */; };
                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 */; };
                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 */; };
+               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 */; };
                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 */; };
                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 */; };
                0C48B380202E438100A0E1AA /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
                0C46A5712034C6BA00F17112 /* OTControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8BBF0E1FCB452400580909 /* OTControl.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 */; };
                0C48B380202E438100A0E1AA /* CloudKitKeychainSyncingMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC08D1C31E64FA8C006237DA /* CloudKitKeychainSyncingMockXCTest.m */; };
-               0C4C547620E1A0B400BA61BA /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C4C548020E1A53D00BA61BA /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
                0C4CDE6F22922E550050C499 /* OctagonTests+RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */; };
                0C4CDE6F22922E550050C499 /* OctagonTests+RecoveryKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */; };
-               0C4D96A621F24E5700617E60 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C4D96A721F25F2C00617E60 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
                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 */; };
                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 */; };
-               0C5663EC20BE2DF30035F362 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0C5663EF20BE2E220035F362 /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
+               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 */; };
                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 */; };
                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 */; };
                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 */; };
                0C66046A2134983900BFBBB8 /* OTEstablishOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6604692134983900BFBBB8 /* OTEstablishOperation.m */; };
                0C66047E2134CA5600BFBBB8 /* OTDeviceInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C66047B2134C88C00BFBBB8 /* OTDeviceInformation.m */; };
-               0C6C0FCB21F1415B00CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FCF21F1457600CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FD021F145F600CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FD121F1465500CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FD221F146E700CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FD321F1494C00CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C6C0FD621F14D3900CD5B9E /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
-               0C78826F20132069002B7475 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */; };
-               0C78827520132074002B7475 /* SFSignInAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */; };
                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 */; };
+               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 */; };
                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 */; };
@@ -894,11 +935,10 @@
                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 */; };
                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 */; };
-               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 */; };
-               0C9FB40920D8735500864612 /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
+               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 */; };
                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 */; };
@@ -933,22 +973,54 @@
                0CB8DC9A2194B14C0021A7C8 /* OTVouchWithBottleOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */; };
                0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
                0CBA047D214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBA047C214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift */; };
                0CB8DC9A2194B14C0021A7C8 /* OTVouchWithBottleOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */; };
                0CB9754F2023A8F5008D6B48 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
                0CBA047D214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBA047C214C4E4D005B3A2F /* OctagonPairingTests+ProxMultiClients.swift */; };
-               0CBD55B31FE883F200A8CE21 /* SFBehavior.m in Sources */ = {isa = PBXBuildFile; fileRef = EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */; };
                0CBEF3432242CA0600015691 /* TestsObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */; };
                0CBEF3432242CA0600015691 /* TestsObjcTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBEF3412242C9AE00015691 /* TestsObjcTranslation.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, ); }; };
+               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 */; };
                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 */; };
                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 */; };
                0CD3D519224048A800024755 /* OTSetRecoveryKeyOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CD3D5152240479600024755 /* OTSetRecoveryKeyOperation.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 */; };
                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 */; };
                0CD9E34323592DD7002995DE /* OctagonSignPosts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD9E33E235928D1002995DE /* OctagonSignPosts.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 */; };
                0CD9E34323592DD7002995DE /* OctagonSignPosts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0CD9E33E235928D1002995DE /* OctagonSignPosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -956,7 +1028,6 @@
                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 */; };
                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 */; };
-               0CE079F41FEA15B20040A3F1 /* SFBehavior.m in Sources */ = {isa = PBXBuildFile; fileRef = EB82A2A51FAFF26900CA64A9 /* SFBehavior.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 */; };
                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 */; };
@@ -971,7 +1042,6 @@
                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 */; };
                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 */; };
-               0CE751AF20ACC497002B2832 /* SFSignInAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.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 */; };
                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 */; };
@@ -982,7 +1052,6 @@
                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 */; };
                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 */; };
-               0CF406522072E422003D6A7F /* SFSignInAnalyticsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */; };
                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 */; };
                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 */; };
@@ -1089,7 +1158,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 */; };
@@ -1116,13 +1184,15 @@
                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 */; };
                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 */; };
                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 */; };
                3DD1FFD1201FDC460086D049 /* STLegacyTests+clientauth41.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1FE78201AA50C0086D049 /* STLegacyTests+clientauth41.m */; };
                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 */; };
                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 */; };
+               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 */; };
@@ -1258,7 +1328,6 @@
                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = DC9082C31EA0276000D0C1C5 /* CKKSZoneChangeFetcher.m */; };
                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */ = {isa = PBXBuildFile; fileRef = DCFE1C331F17ECE5007640C8 /* CKKSCondition.m */; };
                4718AE92205B39C40068EC3F /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.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 */; };
                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78EA01D80860C00865A7C /* swcagent_client.c */; };
                4718AE9E205B39C40068EC3F /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */; };
                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47FF17251FD60ACA00875565 /* SFKeychainServer.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 */; };
@@ -1338,7 +1407,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 */; };
@@ -1363,7 +1431,6 @@
                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 */; };
                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 */; };
@@ -1371,8 +1438,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 */; };
@@ -1386,47 +1451,13 @@
                4771D9A0209B7C2700BA9772 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D99F209B7C2600BA9772 /* Security.framework */; };
                4771D9A2209B7C3900BA9772 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D9A1209B7C3900BA9772 /* Accounts.framework */; };
                477A1F5220320E4A00ACD81D /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 477A1F4C20320E4900ACD81D /* Accounts.framework */; };
                4771D9A0209B7C2700BA9772 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D99F209B7C2600BA9772 /* Security.framework */; };
                4771D9A2209B7C3900BA9772 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4771D9A1209B7C3900BA9772 /* 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 */; };
                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, ); }; };
                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, ); }; };
-               478D42761FD72A8100CAB645 /* server_xpc.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2214A1E8B0861001598BC /* server_xpc.m */; };
-               478D42771FD72A8100CAB645 /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
-               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 */; };
                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
                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, ); }; };
                479108B71EE879F9008CEFA0 /* CKKSAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 479108B51EE879F9008CEFA0 /* CKKSAnalytics.h */; };
                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, ); }; };
@@ -1440,7 +1471,6 @@
                47922D541FAA7E060008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };
                47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
                479231E82065B31300B2718C /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                47922D541FAA7E060008F7E0 /* SecDbKeychainSerializedItemV7.h in Headers */ = {isa = PBXBuildFile; fileRef = 47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */; };
                47922D561FAA7E0D0008F7E0 /* SecDbKeychainSerializedItemV7.m in Sources */ = {isa = PBXBuildFile; fileRef = 47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */; };
                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 */; };
@@ -1449,7 +1479,6 @@
                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, ); }; };
                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 */; };
                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 */; };
@@ -1471,15 +1500,13 @@
                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 */; };
                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 */; };
-               482FE5672177C7260031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
-               482FE5682177C73C0031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
                482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
                482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4A7DD7320A26CF900F51F3F /* AuthKit.framework */; };
-               482FE56A2177C7980031C11E /* 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 */; };
                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 */; };
+               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 */; };
                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.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 */; };
                48FE669620E6E69D00FAEF17 /* SOSAuthKitHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE668F20E6E69B00FAEF17 /* SOSAuthKitHelpers.m */; };
@@ -1693,13 +1720,9 @@
                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 */; };
                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 */; };
-               5A061192229ED6E5006AF14A /* NSDate+SFAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A06118D229ED5EB006AF14A /* NSDate+SFAnalytics.m */; };
-               5A061193229ED6E6006AF14A /* 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 */; };
                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 */; };
-               5A061198229ED8F3006AF14A /* NSDate+SFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A061190229ED60C006AF14A /* NSDate+SFAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               5A061199229ED8F4006AF14A /* NSDate+SFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A061190229ED60C006AF14A /* NSDate+SFAnalytics.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 */; };
                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 */; };
@@ -1763,15 +1786,30 @@
                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, ); }; };
                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 */; };
                5F84950222DFB505008B3EFB /* SecTrustExceptionResetCount.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8494FF22DFB502008B3EFB /* SecTrustExceptionResetCount.m */; };
                6C02134E21F7ED25009D5C80 /* SecDbBackupTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */; };
-               6C02135021F7EF07009D5C80 /* SecDbBackupTests.plist in Copy BATS Test Discovery Plist */ = {isa = PBXBuildFile; fileRef = 6C02134C21F7ED16009D5C80 /* SecDbBackupTests.plist */; };
+               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 */; };
                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 */; };
                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, ); }; };
                6C32BB9920EAE6B00042DF59 /* 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, ); }; };
@@ -1835,12 +1873,56 @@
                6C588D801EAA20AB00D7E322 /* 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, ); }; };
                6C588D801EAA20AB00D7E322 /* 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, ); }; };
+               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 */; };
                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, ); }; };
                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 */; };
                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 */; };
                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 */; };
@@ -1858,73 +1940,30 @@
                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 */; };
-               6C8FF4B3224C1A8D00E5C812 /* TrustedPeers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF88C281EAFFC3F00357577 /* TrustedPeers.framework */; };
+               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 */; };
                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 */; };
-               6C9791CA21C2EAB70074C609 /* NSError+UsefulConstructors.m in Sources */ = {isa = PBXBuildFile; fileRef = DCAE1DD62073FCDE00B4F687 /* NSError+UsefulConstructors.m */; };
                6C9791CB21C325C30074C609 /* SecDbBackupRecoverySet.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6CB6CC022198D4BC0080AD6F /* SecDbBackupRecoverySet.proto */; };
                6C9791CB21C325C30074C609 /* SecDbBackupRecoverySet.proto in Sources */ = {isa = PBXBuildFile; fileRef = 6CB6CC022198D4BC0080AD6F /* SecDbBackupRecoverySet.proto */; };
-               6C98083E1E788AEB00E70590 /* spi.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78CB01D8085D800865A7C /* spi.c */; };
-               6C98084A1E788AEB00E70590 /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.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.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.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 */; };
                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 */; };
-               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 */; };
+               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 */; };
                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 */; };
@@ -1937,8 +1976,6 @@
                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 */; };
                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 */; };
                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 */; };
@@ -1946,10 +1983,10 @@
                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 */; };
                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 */; };
-               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, ); }; };
@@ -1957,12 +1994,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 */; };
                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 */; };
@@ -1980,9 +2014,6 @@
                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 */; };
                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */; };
                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E0861DFD015A0021E1B7 /* SOSAccountGetSet.m */; };
                7281E08D1DFD0B520021E1B7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };
                7200D76F177B9999009BB396 /* ManagedConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C3EC2D1705F24E0040C87C /* ManagedConfiguration.framework */; };
                7281E0871DFD01800021E1B7 /* SOSAccountGetSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7281E0861DFD015A0021E1B7 /* SOSAccountGetSet.m */; };
                7281E08D1DFD0B520021E1B7 /* XPCNotificationDispatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C787331DD0FED50087FC34 /* XPCNotificationDispatcher.m */; };
@@ -2019,6 +2050,15 @@
                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 */; };
+               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 */; };
                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 */; };
@@ -2054,7 +2094,6 @@
                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 */; };
                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 */; };
@@ -2076,7 +2115,6 @@
                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 */; };
                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 */; };
-               BE53601C209BB8970027E25A /* libSecureObjectSyncFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD8A1991E09EE0F00E4FA0A /* libSecureObjectSyncFramework.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 */; };
                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 */; };
@@ -2085,8 +2123,10 @@
                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 */; };
                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 */; };
                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 */; };
@@ -2095,12 +2135,11 @@
                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 */; };
                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 */; };
+               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 */; };
                BE92249E204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */; };
                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */; };
                BE92249E204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = BE92249C204F203C0052E828 /* TrustedPeersHelper.xcdatamodeld */; };
-               BE9B8B4A202BB4A20081EF87 /* si-88-sectrust-valid.m in Sources */ = {isa = PBXBuildFile; fileRef = BE9B8B49202BB4A10081EF87 /* si-88-sectrust-valid.m */; };
-               BE9B8B4B202BB4D10081EF87 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BE9B8B43202BB42C0081EF87 /* si-88-sectrust-valid-data */; };
-               BE9B8B4C202BB4E30081EF87 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BE9B8B43202BB42C0081EF87 /* si-88-sectrust-valid-data */; };
-               BE9B8B4D202BB4F30081EF87 /* si-88-sectrust-valid-data in Resources */ = {isa = PBXBuildFile; fileRef = BE9B8B43202BB42C0081EF87 /* si-88-sectrust-valid-data */; };
                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 */; };
                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 */; };
@@ -2110,7 +2149,7 @@
                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, ); }; };
                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 = (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 */; };
                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 */; };
@@ -2224,7 +2263,6 @@
                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 */; };
                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 */; };
                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 */; };
@@ -2243,6 +2281,10 @@
                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 */; };
                D4267BD123440F8900B54678 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CF730310EF9CDE300E17471 /* CFNetwork.framework */; };
                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 */; };
@@ -2398,7 +2440,6 @@
                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 */; };
                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 */; };
-               D458C51D214E2DEB0043D982 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = D458C4C7214E1A400043D982 /* Base.lproj */; };
                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 */; };
                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 */; };
@@ -2406,7 +2447,10 @@
                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 */; };
                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, ); }; };
                D46246A81F9AE64000D63882 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = D46246A21F9AE49E00D63882 /* oids.h */; settings = {ATTRIBUTES = (Public, ); }; };
                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, ); }; };
                D46246A81F9AE64000D63882 /* oids.h in Headers */ = {isa = PBXBuildFile; fileRef = D46246A21F9AE49E00D63882 /* oids.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2418,8 +2462,6 @@
                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 */; };
                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 */; };
@@ -2447,10 +2489,22 @@
                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, ); }; };
                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 */; };
                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 */; };
                D479F6E31F981FD600388D28 /* OID.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C198F1F0ACDB4BF00AAB142 /* OID.strings */; };
                D479F6E41F981FD600388D28 /* Certificate.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C198F1D0ACDB4BF00AAB142 /* Certificate.strings */; };
                D479F6E21F980FAB00388D28 /* Trust.strings in Resources */ = {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 */; };
@@ -2487,14 +2541,14 @@
                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, ); }; };
                D4911172209559630066A1E4 /* 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, ); }; };
                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 */; };
-               D49A370323873A580065719F /* RevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370023873A570065719F /* RevocationTests.m */; };
-               D49A370423873A580065719F /* RevocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370023873A570065719F /* RevocationTests.m */; };
-               D49A370623873BD30065719F /* TrustDaemonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370523873BD30065719F /* TrustDaemonTestCase.m */; };
-               D49A370723873BD30065719F /* TrustDaemonTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = D49A370523873BD30065719F /* TrustDaemonTestCase.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 */; };
                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 */; };
                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 */; };
@@ -2585,6 +2639,7 @@
                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 */; };
                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 */; };
                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 */; };
@@ -2601,12 +2656,39 @@
                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, ); }; };
                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 */; };
                DA31CB212319DC8F0039F1CC /* TPStringTable.m in Sources */ = {isa = PBXBuildFile; fileRef = DA700FC82310C0E00051A7DE /* TPStringTable.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 */; };
                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 */; };
@@ -2667,7 +2749,6 @@
                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 */; };
-               DC00C91D20B3B79600628BEB /* libsecurity.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC78EA91D8088E200865A7C /* libsecurity.a */; };
                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 */; };
                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 */; };
@@ -2682,7 +2763,8 @@
                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 */; };
                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 */; };
-               DC066DF02102563300694EAF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.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 */; };
                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 */; };
@@ -3284,7 +3366,6 @@
                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, ); }; };
                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, ); }; };
@@ -3315,7 +3396,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, ); }; };
@@ -3345,7 +3425,6 @@
                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 */; };
-               DC1789A21D779DF400B50D50 /* SecBreadcrumb.c in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A01D779DEE00B50D50 /* SecBreadcrumb.c */; };
                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };
                DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };
                DC178A1F1D77A1E700B50D50 /* cssm.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */; };
                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC1789A41D779E3B00B50D50 /* dummy.cpp */; };
                DC1789E91D77A0F300B50D50 /* CloudKeychain.strings in Resources */ = {isa = PBXBuildFile; fileRef = 53C0E1F1177FAC2C00F8A018 /* CloudKeychain.strings */; };
                DC178A1F1D77A1E700B50D50 /* cssm.mdsinfo in Resources */ = {isa = PBXBuildFile; fileRef = DC178A0E1D77A1E700B50D50 /* cssm.mdsinfo */; };
@@ -3368,7 +3447,6 @@
                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 */; };
                DC178A491D77A1F600B50D50 /* authorization.dfr.prompts.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */; };
                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.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */; };
@@ -3391,12 +3469,6 @@
                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                DC222C8A1E089BAE00B09171 /* CKKSSQLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222C891E089BAE00B09171 /* CKKSSQLTests.m */; };
                DC222CA81E08A7D900B09171 /* CloudKitMockXCTest.m in Sources */ = {isa = PBXBuildFile; fileRef = DC222CA71E08A7D900B09171 /* CloudKitMockXCTest.m */; };
                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 107227350D91FE89003CF14F /* libbsm.dylib */; };
                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.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
-               DC2353311ECA658B00D7C1BE /* server_security_helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = DC4269061E82FBDF002B7110 /* server_security_helpers.m */; };
-               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 */; };
                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 */; };
@@ -3424,8 +3496,6 @@
                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 */; };
                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2C5F5B1F0EB97E00FEBDA7 /* CKKSNotifier.m */; };
                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 */; };
                DC2C5F601F0EB97E00FEBDA7 /* 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 */; };
                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 */; };
@@ -3540,7 +3610,6 @@
                DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */; };
                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
                DC3E18C82125015300073D80 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC3D748C1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3D748A1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.h */; };
                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC3D748B1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m */; };
                DC3E18C82125015300073D80 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
-               DC3E18EB2125FB8700073D80 /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.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 */; };
@@ -3565,9 +3634,6 @@
                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 */; };
                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 */; };
-               DC4A76A72212694F006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
-               DC4A76A822126959006F2D8F /* CloudServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8A38C817B93DF10001B4C0 /* CloudServices.framework */; };
-               DC4A76AA22126993006F2D8F /* 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 */; };
                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 */; };
@@ -3775,21 +3841,17 @@
                DC52EDFA1D80D66600B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };
                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 */; };
                DC52EDFA1D80D66600B0A59C /* SOSRegressionUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78D0A1D8085F200865A7C /* SOSRegressionUtilities.m */; };
                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 */; };
                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 */; };
                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 */; };
                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 */; };
-               DC52EE4F1D80D71900B0A59C /* si-28-sectrustsettings.m in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DC81D8085FC00865A7C /* si-28-sectrustsettings.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 */; };
                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 */; };
                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */; };
                DC52EE581D80D73800B0A59C /* si-70-sectrust-unified.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78DFA1D8085FC00865A7C /* si-70-sectrust-unified.c */; };
                DC52EE5A1D80D73800B0A59C /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.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 */; };
                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 */; };
@@ -3907,7 +3969,6 @@
                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 */; };
                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 */; };
                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };
                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 */; };
                DC5AC0D31D83544D00CF422C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC17891E1D77999D00B50D50 /* libsqlite3.dylib */; };
@@ -3930,7 +3991,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 */; };
@@ -4011,13 +4071,10 @@
                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 */; };
                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 */; };
-               DC6013312147220F00863C1A /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.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 */; };
                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 */; };
@@ -4106,6 +4163,7 @@
                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */; };
                DC6DE899213076C000C6B56D /* OTSOSUpgradeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6DE897213076C000C6B56D /* OTSOSUpgradeOperation.h */; };
                DC6DE89C213076C000C6B56D /* OTSOSUpgradeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC6DE898213076C000C6B56D /* OTSOSUpgradeOperation.m */; };
                DC6D2C931DD2836500BE372D /* CKKSOutgoingQueueEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9B7AE61DCBF651004E9385 /* CKKSOutgoingQueueEntry.h */; };
                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 */; };
                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 */; };
                DC71D85C1D94CCD40065FB93 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                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 */; };
@@ -4168,8 +4226,14 @@
                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 */; };
                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 */; };
                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 */; };
@@ -4210,12 +4274,9 @@
                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 */; };
                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 */; };
-               DC93C4C5214713C5008F8362 /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.a */; };
-               DC93C4CA214713E5008F8362 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
-               DC93C4CB214713ED008F8362 /* libaks_mock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC36895E21235F42003A3735 /* libaks_mock.a */; };
-               DC93C4D021471FD8008F8362 /* libsecurityd_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC52E7C21D80BC8000B0A59C /* libsecurityd_ios.a */; };
                DC93F02922387A010072720A /* OTSOSUpdatePreapprovalsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC93F02722387A010072720A /* OTSOSUpdatePreapprovalsOperation.h */; };
                DC93F02A22387A010072720A /* OTSOSUpdatePreapprovalsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC93F02822387A010072720A /* OTSOSUpdatePreapprovalsOperation.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 */; };
                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };
                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */ = {isa = PBXBuildFile; fileRef = DC94BCC81F10448600E07CEB /* CloudKitCategories.h */; };
                DC94BCCC1F10448600E07CEB /* CloudKitCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = DC94BCC91F10448600E07CEB /* CloudKitCategories.m */; };
                DC96053F1ECA2D6400AF9BDA /* SecTask.c in Sources */ = {isa = PBXBuildFile; fileRef = 107226D00D91DB32003CF14F /* SecTask.c */; };
@@ -4224,6 +4285,9 @@
                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 */; };
                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 */; };
                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 */; };
@@ -4274,12 +4338,14 @@
                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };
                DCA4D2171E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D2141E5684220056214F /* CKKSReencryptOutgoingItemsOperation.m */; };
                DCA4D1FF1E552DD50056214F /* CKKSCurrentKeyPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = DCA4D1F41E5520550056214F /* CKKSCurrentKeyPointer.m */; };
                DCA4D2151E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCA4D2131E5684220056214F /* CKKSReencryptOutgoingItemsOperation.h */; };
                DCA4D2171E5684220056214F /* 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 */; };
                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 */; };
                DCA85B9B1E8D981200BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
                DCA85B931E8D97E400BA7241 /* client.c in Sources */ = {isa = PBXBuildFile; fileRef = 7908507F0CA87CF00083CC4D /* client.c */; };
                DCA85B941E8D97E400BA7241 /* 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 */; };
                DCA85B9B1E8D981200BA7241 /* client_endpoint.m in Sources */ = {isa = PBXBuildFile; fileRef = DC844AEC1E81F315007AAB71 /* client_endpoint.m */; };
+               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 */; };
                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 */; };
@@ -4294,6 +4360,7 @@
                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 */; };
                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 */; };
                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 */; };
@@ -4492,7 +4559,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 */; };
@@ -4543,7 +4609,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 */; };
@@ -4670,13 +4735,9 @@
                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 */; };
                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 */; };
-               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 */; };
+               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 */; };
                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */; };
                DCB7D8C31D8E181B00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
                DCB5D93B1E4A9A3400BE22AB /* CKKSSynchronizeOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB5D9391E4A9A3400BE22AB /* CKKSSynchronizeOperation.h */; };
                DCB5D93D1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D93A1E4A9A3400BE22AB /* CKKSSynchronizeOperation.m */; };
                DCB7D8C31D8E181B00867385 /* libsecurity_utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCD06AB01D8E0D53007602F1 /* libsecurity_utilities.a */; };
@@ -4688,6 +4749,7 @@
                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 */; };
                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 */; };
                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };
                DCBB8AC41D80DD95007ED154 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */ = {isa = PBXBuildFile; fileRef = DCBDB3B11E57C67500B61300 /* CKKSKeychainView.m */; };
                DCBDB3BB1E57CA7A00B61300 /* CKKSViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DCBDB3B91E57CA7A00B61300 /* CKKSViewManager.h */; };
@@ -4702,7 +4764,6 @@
                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 */; };
                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 */; };
-               DCBF4AC121FFC82100539F0A /* CoreCDP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C9FB40120D8729A00864612 /* CoreCDP.framework */; };
                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 */; };
                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 */; };
@@ -4728,6 +4789,8 @@
                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 */; };
                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 */; };
@@ -4738,6 +4801,8 @@
                DCC093801D80B0B700F984E4 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; };
                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, ); }; };
                DCC093801D80B0B700F984E4 /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F514B1C3B812500A7CEFE /* SecCFAllocator.h */; };
                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 */; };
                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 */; };
@@ -4808,7 +4873,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 */; };
@@ -5299,6 +5363,8 @@
                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 */; };
@@ -5319,7 +5385,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 */; };
@@ -5334,7 +5400,6 @@
                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 */; };
                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 */; };
-               DCE0774821ADD63C002662FD /* TPPBAncientEpoch.proto in Sources */ = {isa = PBXBuildFile; fileRef = BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.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 */; };
                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 */; };
@@ -5450,11 +5515,9 @@
                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 */; };
                DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DCE4E6D71D7A420D00AFB96E /* main.m */; };
                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 */; };
                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 */; };
                DCE4E7C61D7A468300AFB96E /* libaks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB2CA4D81D2C28C800AB770F /* libaks.a */; };
                DCE4E7BF1D7A463400AFB96E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC1789041D77980500B50D50 /* Security.framework */; };
                DCE4E7C11D7A463E00AFB96E /* SecurityFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCE4E7C01D7A463E00AFB96E /* SecurityFoundation.framework */; };
                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 */; };
@@ -5544,7 +5607,6 @@
                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
                DCEA5D851E2F14810089CF55 /* OctagonAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */; };
                DCEA5D871E2F14810089CF55 /* OctagonAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */; };
                DCEA5D571E2826DB0089CF55 /* CKKSSIV.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */; };
                DCEA5D851E2F14810089CF55 /* OctagonAPSReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */; };
                DCEA5D871E2F14810089CF55 /* OctagonAPSReceiver.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */; };
-               DCEA5D971E3015830089CF55 /* CKKSZone.m in Sources */ = {isa = PBXBuildFile; fileRef = DCEA5D961E3014250089CF55 /* CKKSZone.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 */; };
@@ -5878,7 +5940,6 @@
                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 */; };
                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 */; };
-               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 */; };
                DCFB12C51E95A4C000510F5F /* CKKSAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */; };
                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 /* CKKSAccountStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */; };
@@ -5968,7 +6029,6 @@
                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 */; };
                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 */; };
@@ -6070,8 +6130,6 @@
                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 */; };
                EB49B308202FF421003F34A0 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47D1838B1FB3827700CFCD89 /* OCMock.framework */; };
                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 */; };
                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 */; };
                EB58A0511E74BF07009C10D7 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D82BD316A5EADA0078DFE5 /* Security.framework */; };
                EB59D6731E95F01600997EAC /* libcompression.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EB59D66B1E95EF2900997EAC /* libcompression.dylib */; };
                EB4E0CDB1FF36A9700CDCACC /* 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 */; };
@@ -6140,13 +6198,10 @@
                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };
                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC0BCC361D8C684F00070CB0 /* libutilities.a */; };
                EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC8834081D8A218F00CE0ACA /* libASN1.a */; };
                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CB740680A4749C800D641BB /* libsqlite3.dylib */; };
-               EB75B4901E7540AA00E469CC /* libctkclient_test.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4469FBDC1AA0A45C0021AA26 /* libctkclient_test.a */; };
-               EB75B4911E7540BF00E469CC /* libcoreauthd_test_client.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E8B53A41AA0B8A600345E7B /* libcoreauthd_test_client.a */; };
                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */ = {isa = PBXBuildFile; fileRef = EB75B4931E75A44100E469CC /* SOSPiggyback.h */; };
                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 */; };
                EB75B4951E75A44100E469CC /* SOSPiggyback.h in Headers */ = {isa = PBXBuildFile; fileRef = EB75B4931E75A44100E469CC /* SOSPiggyback.h */; };
                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 */; };
-               EB7732DB21963BC100FCF513 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D4119E72202BDF2B0048587B /* libz.tbd */; };
                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 */; };
@@ -6217,8 +6272,6 @@
                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 */; };
                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 */; };
-               EB9B283321C7755700173DC2 /* OTDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBE971FC9DA5A00580909 /* OTDefines.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               EB9B283421C7755800173DC2 /* OTDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8BBE971FC9DA5A00580909 /* OTDefines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 */; };
                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 */; };
@@ -6290,13 +6343,18 @@
                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 */; };
                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 */; };
+               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, ); }; };
                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, ); }; };
                F9F77E98223C2F9A00E5CBF6 /* requirement.c in Sources */ = {isa = PBXBuildFile; fileRef = F9F77E96223C2F7B00E5CBF6 /* requirement.c */; };
                F9F77E99223C2F9A00E5CBF6 /* requirement.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F77E97223C2F7C00E5CBF6 /* requirement.h */; };
                F964772C1E5832540019E4EB /* SecCodePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD0678E1D8CDF7E007602F1 /* SecCodePriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
                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 */
@@ -6310,10 +6368,9 @@
                        );
                        isEditable = 1;
                        outputFiles = (
                        );
                        isEditable = 1;
                        outputFiles = (
-                               "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).exp",
+                               "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).$(CURRENT_ARCH).exp",
                        );
                        );
-                       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";
+                       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";
                };
                DCF216DD21ADD5D10029CCC1 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
                };
                DCF216DD21ADD5D10029CCC1 /* PBXBuildRule */ = {
                        isa = PBXBuildRule;
@@ -6362,6 +6419,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 */;
@@ -6376,19 +6447,19 @@
                        remoteGlobalIDString = 0C2BCBBD1D0648D100ED7A2F;
                        remoteInfo = dtlsEchoServer;
                };
                        remoteGlobalIDString = 0C2BCBBD1D0648D100ED7A2F;
                        remoteInfo = dtlsEchoServer;
                };
-               0C3E2EA82073F5C400F5B95B /* PBXContainerItemProxy */ = {
+               0C65BB4C23C3F31B0063D2B7 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 4C32C0AE0A4975F6002891BD;
-                       remoteInfo = Security_ios;
+                       remoteGlobalIDString = 0CD743A523C3EC8000FA0EC5;
+                       remoteInfo = Clique;
                };
                };
-               0C5663ED20BE2E1A0035F362 /* PBXContainerItemProxy */ = {
+               0C65BB4E23C3F3270063D2B7 /* 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;
                };
                0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                0C78CCE41FCC97E7008B4B24 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -6404,6 +6475,20 @@
                        remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
                        remoteInfo = otctl;
                };
                        remoteGlobalIDString = 0C8BBEFD1FCB446400580909;
                        remoteInfo = otctl;
                };
+               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;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
                0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                0C85DFD91FB38BB6000343A7 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -6439,13 +6524,6 @@
                        remoteGlobalIDString = DCC78EA81D8088E200865A7C;
                        remoteInfo = security;
                };
                        remoteGlobalIDString = DCC78EA81D8088E200865A7C;
                        remoteInfo = security;
                };
-               0C9AEEB920783FE000BF6237 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC1789031D77980500B50D50;
-                       remoteInfo = Security_osx;
-               };
                0CA378E823876E0900090B7E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                0CA378E823876E0900090B7E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -6467,6 +6545,48 @@
                        remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
                        remoteInfo = libsecurityd_ios;
                };
                        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 */;
                0CF0920F219649DB002B0AEE /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -6523,6 +6643,13 @@
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
+               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 */;
@@ -6586,27 +6713,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 */;
@@ -6614,13 +6720,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 */;
@@ -6656,13 +6755,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;
-               };
                47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                47DE88CD1FA7AD6200DD3254 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -6712,103 +6804,96 @@
                        remoteGlobalIDString = 5346480017331E1100FE9172;
                        remoteInfo = KeychainSyncAccountNotification;
                };
                        remoteGlobalIDString = 5346480017331E1100FE9172;
                        remoteInfo = KeychainSyncAccountNotification;
                };
-               6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
-                       remoteInfo = SecurityBatsTests;
-               };
-               6C8FF4B5224C1A9800E5C812 /* PBXContainerItemProxy */ = {
+               5AAE383523D261CF0025CF9E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = BEF88C271EAFFC3F00357577;
-                       remoteInfo = TrustedPeers;
+                       remoteGlobalIDString = 5A442F81233C330F00918373;
+                       remoteInfo = experimentTool;
                };
                };
-               6C9808301E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C14CA0323C4F6830097B572 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = 4718AE2E205B39C40068EC3F;
+                       remoteInfo = libsecurityd_bridge;
                };
                };
-               6C9808321E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C16258023C4FFC40086A0FF /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
+                       remoteGlobalIDString = D4ADA3181E2B41670031CEA3;
+                       remoteInfo = libtrustd;
                };
                };
-               6C9808361E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C16258323C4FFD40086A0FF /* 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;
                };
-               6C9808381E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C16258523C4FFD40086A0FF /* 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;
                };
-               6C98083A1E788AEB00E70590 /* PBXContainerItemProxy */ = {
+               6C2045F72424BC4400F9461D /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = 6C2045E92424BA7E00F9461D;
+                       remoteInfo = KeychainStasher;
                };
                };
-               6C98086C1E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6C2D797222C06CEB00C3CE32 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
-                       remoteInfo = ASN1_not_installed;
+                       remoteGlobalIDString = 6C39234421F13E4D00D018AD;
+                       remoteInfo = SecDbBackupTests;
                };
                };
-               6C98086E1E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6C2D797422C06CEF00C3CE32 /* 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;
                };
                };
-               6C9808721E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
+                       remoteGlobalIDString = EB9C1DAE1BDFD4DE00F89272;
+                       remoteInfo = SecurityBatsTests;
                };
                };
-               6C9808741E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6C61D3E7242A29BA008AB9BB /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
+                       remoteGlobalIDString = 6C963280242A279B00C53CE2;
+                       remoteInfo = stashtester;
                };
                };
-               6C9808761E788AFD00E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2AB23C3DD64003BB2CA /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = DCC78EA81D8088E200865A7C;
-                       remoteInfo = security;
+                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
+                       remoteInfo = aks_support;
                };
                };
-               6C98089F1E788B9400E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2AD23C3DD64003BB2CA /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_mac;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
                };
                };
-               6C9808A31E788CB100E70590 /* PBXContainerItemProxy */ = {
+               6C7BE2E923C3DD9C003BB2CA /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 6CF4A0DF1E4549F200ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_ios;
+                       remoteGlobalIDString = 6C7BE2A923C3DD64003BB2CA;
+                       remoteInfo = securitytool_bridge;
                };
                6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                };
                6C9A49B11FAB647D00239D58 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -6817,6 +6902,13 @@
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
                        remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
                        remoteInfo = utilities;
                };
+               6CA9690C24ACC5C100C08B5E /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
+                       remoteInfo = utilities;
+               };
                6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                6CAA8D3C1F8431BC007B6E03 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -6831,6 +6923,76 @@
                        remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
                        remoteInfo = supd;
                };
                        remoteGlobalIDString = 6CAA8D1F1F842FB3007B6E03;
                        remoteInfo = supd;
                };
+               6CC638E6226695B900E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;
+               };
+               6CC638E8226695B900E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;
+               };
+               6CC638EA226695C300E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
+                       remoteInfo = SecureObjectSyncServer;
+               };
+               6CC638EC226695C300E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
+                       remoteInfo = SecureObjectSyncFramework;
+               };
+               6CC638FD2266AE0A00E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;
+               };
+               6CC638FF2266AE0A00E5DB0B /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6C39234421F13E4D00D018AD;
+                       remoteInfo = SecDbBackupTests;
+               };
+               6CE2AEAA22B2C1BE00C96AE7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
+                       remoteInfo = "KeychainEntitledTestApp-mac";
+               };
+               6CE2AEAC22B2C1C300C96AE7 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
+                       remoteInfo = "KeychainEntitledTestApp-mac";
+               };
+               6CF33CA52387156600D1E75D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;
+               };
+               6CF33CA72387157200D1E75D /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
+                       remoteInfo = secdxctests;
+               };
                873C14B121540FED003C9C00 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                873C14B121540FED003C9C00 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -7223,13 +7385,6 @@
                        remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
                        remoteInfo = KeychainEntitledTestRunner;
                };
                        remoteGlobalIDString = 6CCDF7831E3C25FA003F2555;
                        remoteInfo = KeychainEntitledTestRunner;
                };
-               D45D8F832224DBEF00D6C124 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 6C9808681E788AFD00E70590;
-                       remoteInfo = CKKSCloudKitTests_ios;
-               };
                D45D8F852224DBF800D6C124 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                D45D8F852224DBF800D6C124 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -7377,13 +7532,6 @@
                        remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
                        remoteInfo = TrustedPeersTests;
                };
                        remoteGlobalIDString = BEF88C2F1EAFFC3F00357577;
                        remoteInfo = TrustedPeersTests;
                };
-               D477EE8221ED48E800C9AAFF /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 478D426C1FD72A8100CAB645;
-                       remoteInfo = secdxctests_mac;
-               };
                D4794E6A21222E72007C6725 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                D4794E6A21222E72007C6725 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -7426,20 +7574,6 @@
                        remoteGlobalIDString = DC3502B41E0208BE00BC0587;
                        remoteInfo = CKKSTests;
                };
                        remoteGlobalIDString = DC3502B41E0208BE00BC0587;
                        remoteInfo = CKKSTests;
                };
-               D4A763DA2224BDAB0063B2B9 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 6C98082C1E788AEB00E70590;
-                       remoteInfo = CKKSCloudKitTests_mac;
-               };
-               D4A763DC2224BDCC0063B2B9 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 6CF4A0B31E45488B00ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_mac;
-               };
                D4A763DE2224BDDC0063B2B9 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                D4A763DE2224BDDC0063B2B9 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -7713,20 +7847,6 @@
                        remoteGlobalIDString = 47702B2D1E5F492C00B29577;
                        remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
                };
                        remoteGlobalIDString = 47702B2D1E5F492C00B29577;
                        remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
                };
-               D4E0E9752224DE9100A802E0 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
-                       remoteInfo = secdxctests_ios;
-               };
-               D4E0E9792224DEE600A802E0 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 6CF4A0DF1E4549F200ECD7B5;
-                       remoteInfo = KeychainEntitledTestApp_ios;
-               };
                D4E0E97B2224DF0300A802E0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                D4E0E97B2224DF0300A802E0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -7888,13 +8008,6 @@
                        remoteGlobalIDString = 47702B2D1E5F492C00B29577;
                        remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
                };
                        remoteGlobalIDString = 47702B2D1E5F492C00B29577;
                        remoteInfo = seckeychainnetworkextensionunauthorizedaccesstest;
                };
-               D4E0E9AB2224DFEB00A802E0 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4727FBB61F9918580003AE36;
-                       remoteInfo = secdxctests_ios;
-               };
                D4E0E9AD2224E00600A802E0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                D4E0E9AD2224E00600A802E0 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -8728,27 +8841,6 @@
                        remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
                        remoteInfo = libsecurityd_ios;
                };
                        remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
                        remoteInfo = libsecurityd_ios;
                };
-               DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
-               };
-               DC34CD3320326C3100302481 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
-               };
-               DC34CD3520326C3B00302481 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC0BCC211D8C684F00070CB0;
-                       remoteInfo = utilities;
-               };
                DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                DC3502C31E020D4D00BC0587 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -9267,13 +9359,6 @@
                        remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
                        remoteInfo = aks_support;
                };
                        remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
                        remoteInfo = aks_support;
                };
-               DC69A5862165298500512BD6 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
-                       remoteInfo = aks_support;
-               };
                DC6BC2731D90D07800DD57B3 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                DC6BC2731D90D07800DD57B3 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -9379,20 +9464,6 @@
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
                        remoteGlobalIDString = DC8834011D8A218F00CE0ACA;
                        remoteInfo = ASN1_not_installed;
                };
-               DC93C4C8214713DC008F8362 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd_ios;
-               };
-               DC93C4CC21471401008F8362 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC52E7731D80BC8000B0A59C;
-                       remoteInfo = libsecurityd_ios;
-               };
                DC99B85D20EACA470065B73B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                DC99B85D20EACA470065B73B /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -9743,20 +9814,6 @@
                        remoteGlobalIDString = DCD66DC41D8205C400DB1393;
                        remoteInfo = libSecOtrOSX;
                };
                        remoteGlobalIDString = DCD66DC41D8205C400DB1393;
                        remoteInfo = libSecOtrOSX;
                };
-               DCD6BF5321E919610015F7A8 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
-                       remoteInfo = aks_support;
-               };
-               DCD6BF5521E9196E0015F7A8 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
-                       remoteInfo = aks_support;
-               };
                DCD6BF5721E919820015F7A8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                DCD6BF5721E919820015F7A8 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -9890,6 +9947,13 @@
                        remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
                        remoteInfo = aks_support;
                };
                        remoteGlobalIDString = DCDA5E4F2124B9C5009B11B2;
                        remoteInfo = aks_support;
                };
+               DCE27860245B81BD00381FE8 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4771D971209A755800BA9772;
+                       remoteInfo = KeychainDataclassOwner;
+               };
                DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                DCE4E8D71D7F37F200AFB96E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -10324,20 +10388,6 @@
                        remoteGlobalIDString = DC0BC5501D8B6D2D00070CB0;
                        remoteInfo = XPCKeychainSandboxCheck;
                };
                        remoteGlobalIDString = DC0BC5501D8B6D2D00070CB0;
                        remoteInfo = XPCKeychainSandboxCheck;
                };
-               EBD7DF8021FF475B0089F2DF /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DC52E8BE1D80C25800B0A59C;
-                       remoteInfo = SecureObjectSyncServer;
-               };
-               EBD7DF8221FF475B0089F2DF /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = DCD8A1061E09EE0F00E4FA0A;
-                       remoteInfo = SecureObjectSyncFramework;
-               };
                EBF374811DC058B60065D840 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
                EBF374811DC058B60065D840 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 4C35DB69094F906D002917C4 /* Project object */;
@@ -10432,16 +10482,6 @@
                        name = "Copy System logging profile";
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        name = "Copy System logging profile";
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               0C9AEEB320783FBB00BF6237 /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                0CA378E623876DEC00090B7E /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
                0CA378E623876DEC00090B7E /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
@@ -10452,16 +10492,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                };
-               0CF4064A2072E3E3003D6A7F /* Embed OCMock */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 10;
-                       files = (
-                       );
-                       name = "Embed OCMock";
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                3D58394821890FFB000ACA44 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                3D58394821890FFB000ACA44 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
@@ -10556,6 +10586,7 @@
                        dstPath = /System/Library/Preferences/Logging/Subsystems;
                        dstSubfolderSpec = 0;
                        files = (
                        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";
                                DC71D8F51D959F150065FB93 /* com.apple.securityd.plist in Copy Logging Files */,
                        );
                        name = "Copy Logging Files";
@@ -10756,6 +10787,28 @@
                        name = "Install man8 page";
                        runOnlyForDeploymentPostprocessing = 1;
                };
                        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;
                6C23F02E227A39FD009F6756 /* Install Sandbox Profile */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 8;
@@ -10777,17 +10830,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               6C7E8F1F21F7BE64008A2D56 /* Copy BATS Test Discovery Plist */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 8;
-                       dstPath = /AppleInternal/CoreOS/BATS/unit_tests;
-                       dstSubfolderSpec = 0;
-                       files = (
-                               6C02135021F7EF07009D5C80 /* SecDbBackupTests.plist in Copy BATS Test Discovery Plist */,
-                       );
-                       name = "Copy BATS Test Discovery Plist";
-                       runOnlyForDeploymentPostprocessing = 1;
-               };
                6C9AA79C1F7C1D8F00D08296 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                6C9AA79C1F7C1D8F00D08296 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
@@ -11292,6 +11334,7 @@
                        dstPath = /System/Library/Preferences/Logging/Subsystems;
                        dstSubfolderSpec = 0;
                        files = (
                        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";
                                DCE4E80E1D7A4E3B00AFB96E /* com.apple.securityd.plist in Copy Logging Files */,
                        );
                        name = "Copy Logging Files";
@@ -11646,16 +11689,18 @@
                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>"; };
                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>"; };
                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>"; };
                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>"; };
                0C0F76DD21399AF40074EDDF /* OTPairingMessage.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = OTPairingMessage.proto; sourceTree = "<group>"; };
-               0C108C4B208A677100E8CF70 /* SFSignInAnalytics+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFSignInAnalytics+Internal.h"; 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>"; };
                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>"; };
@@ -11675,6 +11720,26 @@
                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>"; };
                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>"; };
                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>"; };
@@ -11685,6 +11750,8 @@
                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>"; };
                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>"; };
                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>"; };
@@ -11717,6 +11784,8 @@
                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>"; };
                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>"; };
                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>"; };
@@ -11725,8 +11794,9 @@
                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>"; };
                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>"; };
-               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; };
+               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>"; };
                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>"; };
@@ -11753,16 +11823,29 @@
                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>"; };
                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>"; };
                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>"; };
                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>"; };
                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>"; };
@@ -11788,12 +11871,10 @@
                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; };
                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>"; };
                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; };
                0CF70BD6218BECF500EC3515 /* CuttlefishExtensionWorkaround.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CuttlefishExtensionWorkaround.swift; 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>"; };
                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>"; };
@@ -11826,6 +11907,8 @@
                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; };
                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>"; };
                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>"; };
@@ -11852,6 +11935,8 @@
                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>"; };
                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>"; };
+               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>"; };
                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>"; };
@@ -11886,7 +11971,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; };
@@ -11905,7 +11990,6 @@
                4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SharedWebCredentials.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/SharedWebCredentials.framework; sourceTree = DEVELOPER_DIR; };
                4727FBE61F9921890003AE36 /* ApplePushService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplePushService.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/ApplePushService.framework; sourceTree = DEVELOPER_DIR; };
                4727FBE81F9921D00003AE36 /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/usr/local/lib/libACM.a; sourceTree = DEVELOPER_DIR; };
                4727FBE41F99217A0003AE36 /* SharedWebCredentials.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SharedWebCredentials.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/SharedWebCredentials.framework; sourceTree = DEVELOPER_DIR; };
                4727FBE61F9921890003AE36 /* ApplePushService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplePushService.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/System/Library/PrivateFrameworks/ApplePushService.framework; sourceTree = DEVELOPER_DIR; };
                4727FBE81F9921D00003AE36 /* libACM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libACM.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.Internal.sdk/usr/local/lib/libACM.a; sourceTree = DEVELOPER_DIR; };
-               472E184F20D9A20D00ECE7C9 /* libcoreauthd_client.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoreauthd_client.a; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.0.Internal.sdk/usr/local/lib/libcoreauthd_client.a; sourceTree = DEVELOPER_DIR; };
                473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainControlManager.h; sourceTree = "<group>"; };
                473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFKeychainControlManager.m; sourceTree = "<group>"; };
                473337821FDB29A200E19F30 /* KeychainCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainCheck.h; sourceTree = "<group>"; };
                473337771FDAFBCC00E19F30 /* SFKeychainControlManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFKeychainControlManager.h; sourceTree = "<group>"; };
                473337781FDAFBCC00E19F30 /* SFKeychainControlManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFKeychainControlManager.m; sourceTree = "<group>"; };
                473337821FDB29A200E19F30 /* KeychainCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainCheck.h; sourceTree = "<group>"; };
@@ -11927,7 +12011,6 @@
                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; };
                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; };
-               475EDCFB20D98C3C009D2409 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/libDER.a; sourceTree = SDKROOT; };
                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; };
                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; };
@@ -11956,7 +12039,6 @@
                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; 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>"; };
                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>"; };
@@ -11995,6 +12077,7 @@
                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>"; };
+               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>"; };
                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>"; };
@@ -12186,9 +12269,10 @@
                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>"; };
                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>"; };
                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>"; };
-               6C02134C21F7ED16009D5C80 /* SecDbBackupTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = SecDbBackupTests.plist; path = tests/SecDbBackupTests/SecDbBackupTests.plist; sourceTree = SOURCE_ROOT; };
+               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; };
                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; };
@@ -12208,11 +12292,17 @@
                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>"; };
                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 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; 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; };
                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>"; };
                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; };
                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; };
+               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>"; };
                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>"; };
@@ -12221,10 +12311,15 @@
                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>"; };
                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>"; };
@@ -12233,16 +12328,23 @@
                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>"; };
                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>"; };
                6C880FBE21C334FB00D38D66 /* SecDbBackupBagIdentity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecDbBackupBagIdentity.h; 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>"; };
@@ -12257,16 +12359,24 @@
                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>"; };
                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>"; };
+               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>"; };
                6C9791C421C17D060074C609 /* SecDbBackupManager_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbBackupManager_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; };
+               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>"; };
-               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>"; };
                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; };
                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; };
@@ -12278,7 +12388,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>"; };
@@ -12286,6 +12397,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>"; };
@@ -12293,15 +12407,7 @@
                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>"; };
-               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>"; };
-               6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; 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; };
                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>"; };
                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; path = sec_action.c; sourceTree = "<group>"; };
                7221843F1EC6782A004C7BED /* sec_action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sec_action.h; sourceTree = "<group>"; };
@@ -12336,6 +12442,8 @@
                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>"; };
+               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>"; };
                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>"; };
@@ -12381,7 +12489,7 @@
                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>"; };
                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>"; };
-               BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-84-sectrust-allowlist.m"; 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>"; };
                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>"; };
@@ -12400,11 +12508,9 @@
                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>"; };
                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>"; };
-               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>"; };
+               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; };
                BE92249D204F203C0052E828 /* TrustedPeersHelper.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrustedPeersHelper.xcdatamodel; sourceTree = "<group>"; };
                BE8ABDD71DC2DD9100EC2D58 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
                BE92249D204F203C0052E828 /* TrustedPeersHelper.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TrustedPeersHelper.xcdatamodel; sourceTree = "<group>"; };
-               BE9B8B43202BB42C0081EF87 /* si-88-sectrust-valid-data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "si-88-sectrust-valid-data"; sourceTree = "<group>"; };
-               BE9B8B49202BB4A10081EF87 /* 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; };
                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>"; };
                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>"; };
@@ -12517,6 +12623,8 @@
                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; };
                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; };
+               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>"; };
                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>"; };
@@ -12528,6 +12636,7 @@
                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; };
                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>"; };
                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>"; };
@@ -12649,7 +12758,6 @@
                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>"; };
                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>"; };
-               D458C4C7214E1A400043D982 /* Base.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Base.lproj; path = tests/TrustTests/TestRunners/Base.lproj; 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>"; };
                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>"; };
@@ -12665,13 +12773,14 @@
                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>"; };
                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; };
                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; };
                D46246911F9AE2E400D63882 /* libDER.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDER.a; path = usr/local/lib/security_libDER/libDER.a; sourceTree = SDKROOT; };
                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; };
-               D46513072097954B005D93FE /* si-23-sectrust-ocsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "si-23-sectrust-ocsp.h"; 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; };
                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; };
@@ -12683,14 +12792,25 @@
                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>"; };
                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>"; };
                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>"; };
                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; };
                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>"; };
                D47AB2CA2356AD72005A3801 /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = System/Library/Frameworks/Network.framework; sourceTree = SDKROOT; };
                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; };
                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>"; };
                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>"; };
@@ -12701,10 +12821,6 @@
                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; path = TrustURLSessionDelegate.m; sourceTree = "<group>"; };
                D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrustURLSessionDelegate.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; path = TrustURLSessionDelegate.m; sourceTree = "<group>"; };
                D4961BC52079426000F16DA7 /* TrustURLSessionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TrustURLSessionDelegate.h; sourceTree = "<group>"; };
-               D49A370023873A570065719F /* RevocationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RevocationTests.m; path = tests/TrustTests/EvaluationTests/RevocationTests.m; sourceTree = "<group>"; };
-               D49A370223873A570065719F /* RevocationTests_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RevocationTests_data.h; path = tests/TrustTests/EvaluationTests/RevocationTests_data.h; sourceTree = "<group>"; };
-               D49A370523873BD30065719F /* TrustDaemonTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = TrustDaemonTestCase.m; path = tests/TrustTests/DaemonTests/TrustDaemonTestCase.m; sourceTree = "<group>"; };
-               D49A370823873BF10065719F /* TrustDaemonTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TrustDaemonTestCase.h; path = tests/TrustTests/DaemonTests/TrustDaemonTestCase.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>"; };
                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>"; };
@@ -12800,6 +12916,7 @@
                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>"; };
                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>"; };
                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>"; };
@@ -12844,6 +12961,8 @@
                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>"; };
                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>"; };
                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>"; };
@@ -13418,7 +13537,6 @@
                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>"; };
                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>"; };
@@ -13449,7 +13567,6 @@
                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; };
@@ -13460,7 +13577,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>"; };
@@ -13482,7 +13598,6 @@
                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; 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; };
                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; 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; };
-               DC178A351D77A1F500B50D50 /* framework.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = framework.sb; path = OSX/lib/framework.sb; 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.strings; 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.strings; sourceTree = "<group>"; };
@@ -13528,7 +13643,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; };
@@ -13563,6 +13677,8 @@
                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>"; };
                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>"; };
@@ -13886,6 +14002,8 @@
                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>"; };
                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>"; };
                DC72502D229600A800493D88 /* OctagonTests+Reset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+Reset.swift"; 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>"; };
                DC72502D229600A800493D88 /* OctagonTests+Reset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OctagonTests+Reset.swift"; sourceTree = "<group>"; };
@@ -13921,8 +14039,10 @@
                DC844AEC1E81F315007AAB71 /* client_endpoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = client_endpoint.m; sourceTree = "<group>"; };
                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>"; };
                DC844AEC1E81F315007AAB71 /* client_endpoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = client_endpoint.m; sourceTree = "<group>"; };
                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>"; };
                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>"; };
                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>"; };
@@ -13995,9 +14115,12 @@
                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>"; };
                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>"; };
                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>"; };
@@ -14021,6 +14144,7 @@
                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>"; };
                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>"; };
@@ -14228,7 +14352,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>"; };
@@ -14279,7 +14402,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>"; };
@@ -14400,6 +14522,10 @@
                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>"; };
                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>"; };
                DCB946AD22FCB88400BE4490 /* OTDetermineHSA2AccountStatusOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OTDetermineHSA2AccountStatusOperation.h; 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>"; };
@@ -14409,6 +14535,8 @@
                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>"; };
                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>"; };
@@ -14420,8 +14548,12 @@
                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>"; };
                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>"; };
                DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = security_framework.xcconfig; path = xcconfig/security_framework.xcconfig; sourceTree = "<group>"; };
                DCC0800D1CFF7903005C35C8 /* CSSMOID.exp-in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CSSMOID.exp-in"; 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>"; };
                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>"; };
@@ -14690,14 +14822,11 @@
                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>"; };
                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>"; };
                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>"; };
                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>"; };
-               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>"; };
@@ -14729,24 +14858,12 @@
                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>"; };
                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>"; };
@@ -15181,6 +15298,7 @@
                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; };
                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; };
+               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>"; };
                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>"; };
@@ -15195,7 +15313,6 @@
                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; };
                DCE4E6A71D7A38C000AFB96E /* security2.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = security2.1; 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; };
                DCE4E6A71D7A38C000AFB96E /* security2.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = 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>"; };
                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; };
@@ -15268,8 +15385,6 @@
                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSIV.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>"; };
                DCEA5D541E2826DB0089CF55 /* CKKSSIV.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKKSSIV.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>"; };
-               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>"; };
                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; };
                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>"; };
                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; };
                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>"; };
@@ -15608,7 +15723,6 @@
                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>"; };
                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>"; };
                DCFAEDD51D99A464005187E4 /* secd-36-ks-encrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-36-ks-encrypt.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>"; };
@@ -15704,7 +15818,6 @@
                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>"; };
                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; };
                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; };
@@ -15763,6 +15876,10 @@
                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>"; };
                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; };
                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; };
@@ -15841,8 +15958,6 @@
                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>"; };
                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; };
                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>"; };
                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; };
-               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>"; };
                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; };
                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; };
@@ -15894,21 +16009,24 @@
                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>"; };
                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; path = SecADWrapper.c; sourceTree = "<group>"; };
-               EBF3749B1DC064200065D840 /* SecADWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 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>"; };
+               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>"; };
                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>"; };
                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>"; };
                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 */
@@ -15947,6 +16065,7 @@
                                0C0BDB881756A51000BC1A7E /* libsqlite3.dylib in Frameworks */,
                                BE8ABDD81DC2DD9100EC2D58 /* libz.dylib in Frameworks */,
                                4469FBFF1AA0A4820021AA26 /* libctkclient_test.a 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;
                };
@@ -16005,25 +16124,38 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C3810F123EF6FC4002D7E19 /* OctagonTrust.framework in Frameworks */,
                                0C84D83D1FCF449700B822E3 /* Security.framework in Frameworks */,
                                0CE902352395D0A3005E3F8C /* AuthKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                0C84D83D1FCF449700B822E3 /* Security.framework in Frameworks */,
                                0CE902352395D0A3005E3F8C /* AuthKit.framework in Frameworks */,
                        );
                        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;
                };
@@ -16054,7 +16186,6 @@
                                3DD1FFA5201FC59D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFA4201FC58F0086D049 /* libutilities.a in Frameworks */,
                                3DD1FFA3201FC5870086D049 /* libDiagnosticMessagesClient.tbd 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;
                };
@@ -16069,7 +16200,15 @@
                                3DD1FFC6201FDB1D0086D049 /* Foundation.framework in Frameworks */,
                                3DD1FFC8201FDB1D0086D049 /* libsecurity_ssl.a in Frameworks */,
                                3DD1FFC9201FDB1D0086D049 /* libutilities.a 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;
+               };
+               3E88360B24F068EF00E9F4D6 /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               3E88361B24F08DA100E9F4D6 /* Security.framework in Frameworks */,
+                               3E88360D24F068EF00E9F4D6 /* Foundation.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16081,6 +16220,7 @@
                                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;
                };
@@ -16111,6 +16251,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;
                };
@@ -16146,12 +16287,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;
                };
@@ -16181,45 +16322,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               478D427D1FD72A8100CAB645 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               DC4A76AA22126993006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C6C0FD221F146E700CD5B9E /* CoreCDP.framework in Frameworks */,
-                               EB7732DB21963BC100FCF513 /* libz.tbd in Frameworks */,
-                               482FE56A2177C7980031C11E /* AuthKit.framework in Frameworks */,
-                               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;
@@ -16263,6 +16365,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;
                };
@@ -16270,7 +16373,7 @@
                        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 */,
                                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */,
                                43DB54551BB1F8920083C3F1 /* ProtectedCloudStorage.framework in Frameworks */,
                                4C8A38C917B93DF10001B4C0 /* CloudServices.framework in Frameworks */,
                                4381603B1B4DCEFF00C54D58 /* AggregateDictionary.framework in Frameworks */,
@@ -16293,9 +16396,9 @@
                        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 */,
                                D47AB2D12356B2FE005A3801 /* Network.framework in Frameworks */,
                                DC4A76AD22126A17006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C6C0FD621F14D3900CD5B9E /* CoreCDP.framework in Frameworks */,
                                EB80DE5B219600FC005B10FA /* libz.tbd in Frameworks */,
                                482FE56F2177CF520031C11E /* AuthKit.framework in Frameworks */,
                                D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */,
                                EB80DE5B219600FC005B10FA /* libz.tbd in Frameworks */,
                                482FE56F2177CF520031C11E /* AuthKit.framework in Frameworks */,
                                D4C6C5CF1FB3B44D007EA57E /* libarchive.2.dylib in Frameworks */,
@@ -16328,6 +16431,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;
                };
@@ -16354,11 +16458,11 @@
                                DC4A76A5221268A6006F2D8F /* CloudServices.framework in Frameworks */,
                                EB7732C221963B0500FCF513 /* libz.tbd in Frameworks */,
                                482FE56C2177CEEF0031C11E /* AuthKit.framework in Frameworks */,
                                DC4A76A5221268A6006F2D8F /* CloudServices.framework in Frameworks */,
                                EB7732C221963B0500FCF513 /* libz.tbd in Frameworks */,
                                482FE56C2177CEEF0031C11E /* AuthKit.framework in Frameworks */,
-                               0C9FB40920D8735500864612 /* CoreCDP.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 */,
+                               0CCC22D723F39B7200E1FCD0 /* CoreCDP.framework in Frameworks */,
                                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */,
                                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */,
                                DC65E7361D8CB35E00152EF0 /* libutilities.a in Frameworks */,
                                5296CB4F1655B92F009912AF /* libMobileGestalt.dylib in Frameworks */,
                                4432B0B71A014987000958DC /* libaks_acl.a in Frameworks */,
                                DC65E7361D8CB35E00152EF0 /* libutilities.a in Frameworks */,
@@ -16389,6 +16493,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;
                };
@@ -16425,7 +16530,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC4A76A02212676D006F2D8F /* CloudServices.framework in Frameworks */,
                        buildActionMask = 2147483647;
                        files = (
                                DC4A76A02212676D006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C6C0FCB21F1415B00CD5B9E /* CoreCDP.framework in Frameworks */,
                                EB80DE5D21960C0A005B10FA /* libz.tbd in Frameworks */,
                                482FE5662177C6E40031C11E /* AuthKit.framework in Frameworks */,
                                482FE5652177C6D90031C11E /* Accounts.framework in Frameworks */,
                                EB80DE5D21960C0A005B10FA /* libz.tbd in Frameworks */,
                                482FE5662177C6E40031C11E /* AuthKit.framework in Frameworks */,
                                482FE5652177C6D90031C11E /* Accounts.framework in Frameworks */,
@@ -16445,6 +16549,17 @@
                                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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16452,7 +16567,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               6C8FF4B3224C1A8D00E5C812 /* TrustedPeers.framework in Frameworks */,
                                6C540C3922289A3B0032B5BC /* CloudServices.framework in Frameworks */,
                                6C39235B21F13E4D00D018AD /* libz.dylib in Frameworks */,
                                6C39235C21F13E4D00D018AD /* AuthKit.framework in Frameworks */,
                                6C540C3922289A3B0032B5BC /* CloudServices.framework in Frameworks */,
                                6C39235B21F13E4D00D018AD /* libz.dylib in Frameworks */,
                                6C39235C21F13E4D00D018AD /* AuthKit.framework in Frameworks */,
@@ -16478,6 +16592,7 @@
                                6C39237221F13E4D00D018AD /* libutilities.a in Frameworks */,
                                6C39237321F13E4D00D018AD /* libsecdRegressions.a in Frameworks */,
                                6C39237421F13E4D00D018AD /* Foundation.framework 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;
                };
@@ -16494,70 +16609,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 = (
-                               DC4A76A822126959006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C4D96A721F25F2C00617E60 /* CoreCDP.framework in Frameworks */,
-                               482FE5672177C7260031C11E /* AuthKit.framework in Frameworks */,
-                               6CAA8CDD1F82EDEF007B6E03 /* Security.framework in Frameworks */,
-                               D46246BC1F9AE82B00D63882 /* libDER.a in Frameworks */,
-                               6C98084A1E788AEB00E70590 /* libASN1.a in Frameworks */,
-                               6C98084D1E788AEB00E70590 /* libSecureObjectSyncFramework.a in Frameworks */,
-                               6C98084E1E788AEB00E70590 /* libSecureObjectSyncServer.a in Frameworks */,
-                               DC93C4C5214713C5008F8362 /* libaks_mock.a in Frameworks */,
-                               DC93C4D021471FD8008F8362 /* libsecurityd_ios.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 = (
-                               DC4A76A72212694F006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C6C0FD021F145F600CD5B9E /* CoreCDP.framework in Frameworks */,
-                               482FE5682177C73C0031C11E /* AuthKit.framework in Frameworks */,
-                               6CAA8CEE1F83E417007B6E03 /* Security.framework in Frameworks */,
-                               D46246BD1F9AE83600D63882 /* libDER.a in Frameworks */,
-                               6C9808861E788AFD00E70590 /* libASN1.a in Frameworks */,
-                               6C9808891E788AFD00E70590 /* libSecureObjectSyncFramework.a in Frameworks */,
-                               6C98088A1E788AFD00E70590 /* libSecureObjectSyncServer.a in Frameworks */,
-                               DC93C4CB214713ED008F8362 /* libaks_mock.a in Frameworks */,
-                               DC93C4CA214713E5008F8362 /* libsecurityd_ios.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;
                };
@@ -16596,19 +16675,10 @@
                        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;
                790851B40CA9859F0083CC4D /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
@@ -16628,6 +16698,7 @@
                                E71F3E3116EA69A900FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4CAF66190F3A6FCD0064A534 /* IOKit.framework in Frameworks */,
                                4C2215220F3A612C00835155 /* libsqlite3.dylib in Frameworks */,
                                E71F3E3116EA69A900FAF9B4 /* SystemConfiguration.framework in Frameworks */,
                                4CAF66190F3A6FCD0064A534 /* IOKit.framework in Frameworks */,
                                4C2215220F3A612C00835155 /* libsqlite3.dylib in Frameworks */,
+                               0C2B32A423C4000F00A97B18 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16698,6 +16769,7 @@
                                D401E8B420A26F1F00CD8BB4 /* CoreData.framework in Frameworks */,
                                DC340C54208E828F004D7EEC /* TrustedPeers.framework in Frameworks */,
                                BE9F8D15206C2E0200B53D16 /* libutilities.a in Frameworks */,
                                D401E8B420A26F1F00CD8BB4 /* CoreData.framework in Frameworks */,
                                DC340C54208E828F004D7EEC /* TrustedPeers.framework in Frameworks */,
                                BE9F8D15206C2E0200B53D16 /* libutilities.a in Frameworks */,
+                               DA53FC4923A9CC8D002D5EA9 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16727,7 +16799,6 @@
                                DC00C92320B3B80500628BEB /* libbsm.tbd in Frameworks */,
                                DC00C92420B3B82600628BEB /* libz.tbd in Frameworks */,
                                DC00C92020B3B7CC00628BEB /* libDER.a in Frameworks */,
                                DC00C92320B3B80500628BEB /* libbsm.tbd in Frameworks */,
                                DC00C92420B3B82600628BEB /* libz.tbd in Frameworks */,
                                DC00C92020B3B7CC00628BEB /* libDER.a in Frameworks */,
-                               DC6013312147220F00863C1A /* libaks_mock.a in Frameworks */,
                                DC60132E2147220600863C1A /* libsecurityd_ios.a in Frameworks */,
                                BE53602D209BBF630027E25A /* libMobileGestalt.tbd in Frameworks */,
                                DC9C06712149E6B900C6F7B8 /* AuthKit.framework in Frameworks */,
                                DC60132E2147220600863C1A /* libsecurityd_ios.a in Frameworks */,
                                BE53602D209BBF630027E25A /* libMobileGestalt.tbd in Frameworks */,
                                DC9C06712149E6B900C6F7B8 /* AuthKit.framework in Frameworks */,
@@ -16736,10 +16807,9 @@
                                BED987DF209918A500607A5F /* SecurityFoundation.framework in Frameworks */,
                                BED987D82099145300607A5F /* TrustedPeers.framework in Frameworks */,
                                DC00C93520B48BA800628BEB /* IOKit.framework in Frameworks */,
                                BED987DF209918A500607A5F /* SecurityFoundation.framework in Frameworks */,
                                BED987D82099145300607A5F /* TrustedPeers.framework in Frameworks */,
                                DC00C93520B48BA800628BEB /* IOKit.framework in Frameworks */,
-                               DC00C91D20B3B79600628BEB /* libsecurity.a in Frameworks */,
-                               BE53601C209BB8970027E25A /* libSecureObjectSyncFramework.a in Frameworks */,
                                BE53601B209BB8390027E25A /* libSecureObjectSyncServer.a in Frameworks */,
                                BE53601A209BB7F80027E25A /* libutilities.a in Frameworks */,
                                BE53601B209BB8390027E25A /* libSecureObjectSyncServer.a in Frameworks */,
                                BE53601A209BB7F80027E25A /* libutilities.a in Frameworks */,
+                               DA3862A723A9CD2E001E21F1 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16775,6 +16845,7 @@
                                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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16796,6 +16867,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 */,
                                D4FD4225217D7BEE002B7EE2 /* libarchive.2.tbd in Frameworks */,
                                D453A4B22122236D00850A26 /* libz.tbd in Frameworks */,
                                D453A4B32122236D00850A26 /* libsqlite3.tbd in Frameworks */,
@@ -16810,6 +16882,7 @@
                                D453A4B92122236D00850A26 /* Foundation.framework in Frameworks */,
                                D453A4BA2122236D00850A26 /* IOKit.framework in Frameworks */,
                                D40B7CA021605BF800AC9A75 /* OCMock.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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16828,6 +16901,7 @@
                        files = (
                                D458C512214E20850043D982 /* XCTest.framework in Frameworks */,
                                D458C507214E20540043D982 /* Foundation.framework in Frameworks */,
                        files = (
                                D458C512214E20850043D982 /* XCTest.framework in Frameworks */,
                                D458C507214E20540043D982 /* Foundation.framework in Frameworks */,
+                               DA2F592623A99EC900C30285 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -16835,6 +16909,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 */,
                                D4FD4224217D7BE4002B7EE2 /* libarchive.2.tbd in Frameworks */,
                                D4B68C62211A80CE009FED69 /* libz.tbd in Frameworks */,
                                D4B68C5F211A80B1009FED69 /* libsqlite3.tbd in Frameworks */,
@@ -16847,6 +16922,7 @@
                                D4B68C60211A80BC009FED69 /* CoreFoundation.framework in Frameworks */,
                                D4B68C61211A80C4009FED69 /* Foundation.framework in Frameworks */,
                                D4B68C63211A80DA009FED69 /* IOKit.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;
                };
@@ -17092,8 +17168,10 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D49BD0772476F7C000FC7E1C /* libMobileGestalt.tbd in Frameworks */,
                                4C47FA9420A51DD800384CB6 /* AppleFSCompression.framework in Frameworks */,
                                DCD22D4B1D8CBF54001C9B81 /* libASN1.a in Frameworks */,
                                4C47FA9420A51DD800384CB6 /* AppleFSCompression.framework 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 */,
@@ -17143,6 +17221,7 @@
                                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;
                };
@@ -17158,7 +17237,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                DCF465742201155000BA6EEA /* CloudServices.framework in Frameworks */,
                        buildActionMask = 2147483647;
                        files = (
                                DCF465742201155000BA6EEA /* CloudServices.framework in Frameworks */,
-                               0C6C0FD121F1465500CD5B9E /* CoreCDP.framework in Frameworks */,
                                DC391FAE21C1903E00772585 /* libutilities.a in Frameworks */,
                                EBD531772198AF19003A57E6 /* Accounts.framework in Frameworks */,
                                EBD531762198AF0B003A57E6 /* AppleAccount.framework in Frameworks */,
                                DC391FAE21C1903E00772585 /* libutilities.a in Frameworks */,
                                EBD531772198AF19003A57E6 /* Accounts.framework in Frameworks */,
                                EBD531762198AF0B003A57E6 /* AppleAccount.framework in Frameworks */,
@@ -17177,6 +17255,7 @@
                                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */,
                                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */,
                                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */,
                                DC222C361E02419B00B09171 /* libbsm.dylib in Frameworks */,
                                DC3502CA1E020DC100BC0587 /* libsqlite3.0.dylib in Frameworks */,
                                DC222C321E0240D300B09171 /* libz.dylib in Frameworks */,
+                               DA53FC4023A9C351002D5EA9 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -17327,9 +17406,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 */,
-                               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 */,
                        );
@@ -17339,9 +17418,9 @@
                        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 */,
                                D47AB2D62357955F005A3801 /* Network.framework in Frameworks */,
                                DCF46573220114F000BA6EEA /* CloudServices.framework in Frameworks */,
-                               0C4D96A621F24E5700617E60 /* CoreCDP.framework in Frameworks */,
                                EB80DE56219600C6005B10FA /* libz.tbd in Frameworks */,
                                DC9C066F2149E36900C6F7B8 /* AuthKit.framework in Frameworks */,
                                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */,
                                EB80DE56219600C6005B10FA /* libz.tbd in Frameworks */,
                                DC9C066F2149E36900C6F7B8 /* AuthKit.framework in Frameworks */,
                                47C2F1762059A2300062DE30 /* libprequelite.tbd in Frameworks */,
@@ -17350,6 +17429,7 @@
                                474B5FC81E662E79007546F8 /* SecurityFoundation.framework in Frameworks */,
                                D43B88721E72298500F86F19 /* MobileAsset.framework in Frameworks */,
                                DC4EA5961E70A237008840B4 /* libsecurity.a 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 */,
@@ -17381,6 +17461,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;
                };
@@ -17433,6 +17514,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 */,
                                DCF465762201162800BA6EEA /* CloudServices.framework in Frameworks */,
                                DC3E18C82125015300073D80 /* libsecurityd_ios.a in Frameworks */,
                                DCCFB14E212394EC003D2DA2 /* libaks_mock.a in Frameworks */,
@@ -17450,6 +17532,7 @@
                                DC99B88920EACA470065B73B /* libSecureObjectSyncServer.a in Frameworks */,
                                DC99B88A20EACA470065B73B /* libutilities.a in Frameworks */,
                                DC99B88B20EACA470065B73B /* libASN1.a in Frameworks */,
                                DC99B88920EACA470065B73B /* libSecureObjectSyncServer.a in Frameworks */,
                                DC99B88A20EACA470065B73B /* libutilities.a in Frameworks */,
                                DC99B88B20EACA470065B73B /* libASN1.a in Frameworks */,
+                               DA3862A923AAD1FD001E21F1 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -17499,7 +17582,6 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               DCBF4AC121FFC82100539F0A /* CoreCDP.framework in Frameworks */,
                                DCBF4AC221FFC82100539F0A /* libutilities.a in Frameworks */,
                                DCBF4AC321FFC82100539F0A /* Accounts.framework in Frameworks */,
                                DCBF4AC421FFC82100539F0A /* AppleAccount.framework in Frameworks */,
                                DCBF4AC221FFC82100539F0A /* libutilities.a in Frameworks */,
                                DCBF4AC321FFC82100539F0A /* Accounts.framework in Frameworks */,
                                DCBF4AC421FFC82100539F0A /* AppleAccount.framework in Frameworks */,
@@ -17598,12 +17680,12 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               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 */,
                                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 */,
-                               0C4C548020E1A53D00BA61BA /* CoreCDP.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 */,
@@ -17633,6 +17715,7 @@
                        files = (
                                D47AB2D02356B2F6005A3801 /* Network.framework in Frameworks */,
                                09EF431B21A5A8CC0066CF20 /* libaks_acl.a in Frameworks */,
                        files = (
                                D47AB2D02356B2F6005A3801 /* Network.framework 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 */,
@@ -17710,6 +17793,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;
                };
@@ -17724,13 +17808,14 @@
                                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */,
                                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */,
                                D40B6A831E2B5F5B00CD6EE5 /* libASN1.a in Frameworks */,
                                D40B6A9E1E2B6A6F00CD6EE5 /* libtrustd.a in Frameworks */,
                                D40B6A931E2B67E500CD6EE5 /* libutilities.a in Frameworks */,
                                D40B6A831E2B5F5B00CD6EE5 /* libASN1.a in Frameworks */,
-                               D40B6A9D1E2B6A2700CD6EE5 /* login.framework in Frameworks */,
+                               D4981B8F24F723EA004B033B /* IOKit.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 */,
                                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 */,
+                               DA2F592123A9874800C30285 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -17741,11 +17826,13 @@
                                5E01F5B1227C859200BC884C /* Foundation.framework in Frameworks */,
                                DCE4E8C91D7F356500AFB96E /* libsqlite3.dylib in Frameworks */,
                                DCE4E8C81D7F355F00AFB96E /* libbsm.dylib in Frameworks */,
                                5E01F5B1227C859200BC884C /* Foundation.framework 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;
                };
@@ -17764,7 +17851,7 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               0C4C547620E1A0B400BA61BA /* 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 */,
@@ -17860,9 +17947,9 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               0C147A2823F39CD10034F08B /* CoreCDP.framework in Frameworks */,
                                D47AB2CF2356B2ED005A3801 /* Network.framework in Frameworks */,
                                DC4A76A62212691F006F2D8F /* CloudServices.framework in Frameworks */,
                                D47AB2CF2356B2ED005A3801 /* Network.framework in Frameworks */,
                                DC4A76A62212691F006F2D8F /* CloudServices.framework in Frameworks */,
-                               0C6C0FCF21F1457600CD5B9E /* CoreCDP.framework in Frameworks */,
                                EB80DE5C2196010F005B10FA /* libz.tbd in Frameworks */,
                                482FE56D2177CF150031C11E /* AuthKit.framework in Frameworks */,
                                D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */,
                                EB80DE5C2196010F005B10FA /* libz.tbd in Frameworks */,
                                482FE56D2177CF150031C11E /* AuthKit.framework in Frameworks */,
                                D4C6C5D01FB3B45E007EA57E /* libarchive.2.dylib in Frameworks */,
@@ -17895,6 +17982,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;
                };
@@ -17944,7 +18032,6 @@
                                DCD22D531D8CC0EF001C9B81 /* libASN1.a in Frameworks */,
                                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */,
                                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */,
                                DCD22D531D8CC0EF001C9B81 /* libASN1.a in Frameworks */,
                                E7F482A11C7543E500390FDB /* libsqlite3.dylib in Frameworks */,
                                E7F482A31C7544E600390FDB /* libctkclient_test.a in Frameworks */,
-                               E7F482A61C75453900390FDB /* libcoreauthd_test_client.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -17978,8 +18065,6 @@
                                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */,
                                EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */,
                                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */,
                                EB75B48C1E75407C00E469CC /* libutilities.a in Frameworks */,
                                EB75B48D1E75408900E469CC /* libASN1.a in Frameworks */,
                                EB75B48F1E75409A00E469CC /* libsqlite3.dylib in Frameworks */,
-                               EB75B4901E7540AA00E469CC /* libctkclient_test.a in Frameworks */,
-                               EB75B4911E7540BF00E469CC /* libcoreauthd_test_client.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -18024,14 +18109,14 @@
                        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 */,
                                DC4A76AC221269E4006F2D8F /* CloudServices.framework in Frameworks */,
                                EB49B2BB202D8894003F34A0 /* libsecurityd_ios.a in Frameworks */,
-                               DC3E18EB2125FB8700073D80 /* libaks_mock.a in Frameworks */,
                                EB49B2DD202DF259003F34A0 /* libbsm.tbd in Frameworks */,
                                EB80DE59219600DF005B10FA /* libz.tbd in Frameworks */,
                                EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */,
                                482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */,
                                EB49B2DD202DF259003F34A0 /* libbsm.tbd in Frameworks */,
                                EB80DE59219600DF005B10FA /* libz.tbd in Frameworks */,
                                EB49B2C2202DF002003F34A0 /* libDER.a in Frameworks */,
                                482FE5692177C7670031C11E /* AuthKit.framework in Frameworks */,
-                               0C6C0FD321F1494C00CD5B9E /* CoreCDP.framework in Frameworks */,
                                EB49B2BE202DEF29003F34A0 /* libSecureObjectSyncServer.a in Frameworks */,
                                EB49B2C1202DEF8D003F34A0 /* libASN1.a in Frameworks */,
                                EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */,
                                EB49B2BE202DEF29003F34A0 /* libSecureObjectSyncServer.a in Frameworks */,
                                EB49B2C1202DEF8D003F34A0 /* libASN1.a in Frameworks */,
                                EB49B2C0202DEF7D003F34A0 /* libutilities.a in Frameworks */,
@@ -18040,6 +18125,7 @@
                                EB49B2CD202DF0F9003F34A0 /* SystemConfiguration.framework in Frameworks */,
                                EB49B2C7202DF0E9003F34A0 /* IOKit.framework in Frameworks */,
                                EB49B2BC202DEF14003F34A0 /* libsqlite3.tbd in Frameworks */,
                                EB49B2CD202DF0F9003F34A0 /* SystemConfiguration.framework in Frameworks */,
                                EB49B2C7202DF0E9003F34A0 /* IOKit.framework in Frameworks */,
                                EB49B2BC202DEF14003F34A0 /* libsqlite3.tbd in Frameworks */,
+                               DA53FC4223A9C442002D5EA9 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -18057,6 +18143,7 @@
                                EB6952B1223B75C300F02C1C /* CoreData.framework in Frameworks */,
                                EB6952B2223B75C300F02C1C /* SystemConfiguration.framework in Frameworks */,
                                EB6952B3223B75C300F02C1C /* libsqlite3.dylib in Frameworks */,
                                EB6952B1223B75C300F02C1C /* CoreData.framework in Frameworks */,
                                EB6952B2223B75C300F02C1C /* SystemConfiguration.framework in Frameworks */,
                                EB6952B3223B75C300F02C1C /* libsqlite3.dylib in Frameworks */,
+                               DA2F592823A99F6300C30285 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -18082,6 +18169,7 @@
                                EB89087921F17D3C00F0DDDB /* Security.framework in Frameworks */,
                                EB89087B21F17D3C00F0DDDB /* SystemConfiguration.framework in Frameworks */,
                                EB89087E21F17D3C00F0DDDB /* libsqlite3.dylib 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;
                };
@@ -18117,6 +18205,7 @@
                                EBB8521D22F7948B00424FD0 /* libutilities.a in Frameworks */,
                                EBB8521B22F7945600424FD0 /* XCTest.framework in Frameworks */,
                                EBB852CF22F7A05600424FD0 /* OCMock.framework in Frameworks */,
                                EBB8521D22F7948B00424FD0 /* libutilities.a in Frameworks */,
                                EBB8521B22F7945600424FD0 /* XCTest.framework in Frameworks */,
                                EBB852CF22F7A05600424FD0 /* OCMock.framework in Frameworks */,
+                               DA53FC4823A9CC16002D5EA9 /* SoftLinking.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -18160,6 +18249,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 = (
@@ -18200,14 +18320,6 @@
                        path = Categories;
                        sourceTree = "<group>";
                };
                        path = Categories;
                        sourceTree = "<group>";
                };
-               0C4C546C20E19CF200BA61BA /* Recovered References */ = {
-                       isa = PBXGroup;
-                       children = (
-                               0C9FB40120D8729A00864612 /* CoreCDP.framework */,
-                       );
-                       name = "Recovered References";
-                       sourceTree = "<group>";
-               };
                0C7382E52386379E004F98CB /* ResetCloudKeychainAccount */ = {
                        isa = PBXGroup;
                        children = (
                0C7382E52386379E004F98CB /* ResetCloudKeychainAccount */ = {
                        isa = PBXGroup;
                        children = (
@@ -18226,16 +18338,7 @@
                        path = regressions;
                        sourceTree = "<group>";
                };
                        path = regressions;
                        sourceTree = "<group>";
                };
-               0C7CEA391FE9CE3900125C79 /* behavior */ = {
-                       isa = PBXGroup;
-                       children = (
-                               EB82A2A41FAFF26900CA64A9 /* SFBehavior.h */,
-                               EB82A2A51FAFF26900CA64A9 /* SFBehavior.m */,
-                       );
-                       path = behavior;
-                       sourceTree = "<group>";
-               };
-               0C8BBE831FC9DA1700580909 /* Octagon Trust */ = {
+               0C8BBE831FC9DA1700580909 /* OT */ = {
                        isa = PBXGroup;
                        children = (
                                DCD33D7D220B9D98000A390B /* State Machine Machinery */,
                        isa = PBXGroup;
                        children = (
                                DCD33D7D220B9D98000A390B /* State Machine Machinery */,
@@ -18277,7 +18380,7 @@
                                BE34059B1FD71BA700933DAC /* Protocol Buffers */,
                                0C8BBEB11FC9DCAC00580909 /* tests */,
                        );
                                BE34059B1FD71BA700933DAC /* Protocol Buffers */,
                                0C8BBEB11FC9DCAC00580909 /* tests */,
                        );
-                       name = "Octagon Trust";
+                       name = OT;
                        path = ot;
                        sourceTree = "<group>";
                };
                        path = ot;
                        sourceTree = "<group>";
                };
@@ -18285,6 +18388,8 @@
                        isa = PBXGroup;
                        children = (
                                DC99B89720EAD4D20065B73B /* Octagon */,
                        isa = PBXGroup;
                        children = (
                                DC99B89720EAD4D20065B73B /* Octagon */,
+                               EB45ED3124749ECC008A1F6F /* OTTests-Info.plist */,
+                               EB45ED3224749ECC008A1F6F /* gen_test_plist.py */,
                        );
                        path = tests;
                        sourceTree = "<group>";
                        );
                        path = tests;
                        sourceTree = "<group>";
@@ -18336,6 +18441,40 @@
                        path = generated_source;
                        sourceTree = "<group>";
                };
                        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 = (
                0CE15E29222DF5FF00B7EAA4 /* RecoveryKey */ = {
                        isa = PBXGroup;
                        children = (
@@ -18351,9 +18490,6 @@
                                0CF405FB2072E351003D6A7F /* Resources */,
                                0CD9E33E235928D1002995DE /* OctagonSignPosts.h */,
                                0CD9E340235928E9002995DE /* OctagonSignPosts.m */,
                                0CF405FB2072E351003D6A7F /* Resources */,
                                0CD9E33E235928D1002995DE /* OctagonSignPosts.h */,
                                0CD9E340235928E9002995DE /* OctagonSignPosts.m */,
-                               0CF0E2E71F8EE40700BD18E4 /* SFSignInAnalytics.h */,
-                               0CF0E2E31F8EE3B000BD18E4 /* SFSignInAnalytics.m */,
-                               0C108C4B208A677100E8CF70 /* SFSignInAnalytics+Internal.h */,
                                0CF405F32072E295003D6A7F /* tests */,
                        );
                        path = SigninMetrics;
                                0CF405F32072E295003D6A7F /* tests */,
                        );
                        path = SigninMetrics;
@@ -18362,7 +18498,6 @@
                0CF405F32072E295003D6A7F /* tests */ = {
                        isa = PBXGroup;
                        children = (
                0CF405F32072E295003D6A7F /* tests */ = {
                        isa = PBXGroup;
                        children = (
-                               0CF405F42072E2BF003D6A7F /* SFSignInAnalyticsTests.m */,
                        );
                        path = tests;
                        sourceTree = "<group>";
                        );
                        path = tests;
                        sourceTree = "<group>";
@@ -18382,6 +18517,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;
@@ -18416,6 +18552,14 @@
                        path = SecureTransportTests;
                        sourceTree = "<group>";
                };
                        path = SecureTransportTests;
                        sourceTree = "<group>";
                };
+               3E88361224F0693200E9F4D6 /* secseccodeapitest */ = {
+                       isa = PBXGroup;
+                       children = (
+                               3E88361324F0699F00E9F4D6 /* secseccodeapitest.c */,
+                       );
+                       name = secseccodeapitest;
+                       sourceTree = "<group>";
+               };
                4381690E1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXGroup;
                        children = (
                4381690E1B4EDCBD00C54D58 /* SOSCCAuthPlugin */ = {
                        isa = PBXGroup;
                        children = (
@@ -18489,6 +18633,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 */,
@@ -18496,7 +18641,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>";
@@ -18566,6 +18713,7 @@
                                47922D171FAA65120008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.proto */,
                                47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */,
                                47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */,
                                47922D171FAA65120008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.proto */,
                                47922D201FAA75FF0008F7E0 /* SecDbKeychainSerializedMetadata.proto */,
                                47922D2C1FAA77970008F7E0 /* SecDbKeychainSerializedSecretData.proto */,
+                               6C6AF178221A03930091CE0A /* SecDbKeychainSerializedMetadataKey.proto */,
                        );
                        path = "SecDbKeychainV7-protobufs";
                        sourceTree = "<group>";
                        );
                        path = "SecDbKeychainV7-protobufs";
                        sourceTree = "<group>";
@@ -18574,6 +18722,7 @@
                        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 */,
                        );
                                EB3FB9B7231C12A800DF52EA /* com.apple.security.trustedpeers.plist */,
                                48284A041D1DB06E00C76CB7 /* README_os_log_prefs.txt */,
                        );
@@ -18599,6 +18748,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 */,
@@ -18619,7 +18770,6 @@
                                4CAB97FD1114CC5300EFB38D /* README.keychain */,
                                4C4CE9070AF81ED80056B01D /* TODO */,
                                EBAC4A512189743D00FBEC43 /* rio.yml */,
                                4CAB97FD1114CC5300EFB38D /* README.keychain */,
                                4C4CE9070AF81ED80056B01D /* TODO */,
                                EBAC4A512189743D00FBEC43 /* rio.yml */,
-                               0C4C546C20E19CF200BA61BA /* Recovered References */,
                        );
                        sourceTree = "<group>";
                };
                        );
                        sourceTree = "<group>";
                };
@@ -18739,7 +18889,6 @@
                                D4ADA3191E2B41670031CEA3 /* libtrustd.a */,
                                6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */,
                                D4ADA3191E2B41670031CEA3 /* libtrustd.a */,
                                6CCDF7841E3C25FA003F2555 /* KeychainEntitledTestRunner */,
                                6CF4A0B41E45488B00ECD7B5 /* KeychainEntitledTestApp.app */,
-                               6CF4A0E01E4549F200ECD7B5 /* KeychainEntitledTestApp.app */,
                                EB27FF111E402CD300EC9E3A /* ckksctl */,
                                470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1E1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
                                EB27FF111E402CD300EC9E3A /* ckksctl */,
                                470415CF1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1E1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
@@ -18747,8 +18896,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 */,
@@ -18756,7 +18903,7 @@
                                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 */,
                                0C85E0031FB38BB6000343A7 /* OTTests.xctest */,
                                6C9AA79E1F7C1D8F00D08296 /* supdctl */,
                                6CAA8D201F842FB3007B6E03 /* securityuploadd */,
@@ -18765,13 +18912,10 @@
                                3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */,
                                3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */,
                                BEAA002B202A832500E51F45 /* TrustedPeersHelper.xpc */,
                                3DD1FF4D201C07F30086D049 /* SecureTransport_macos_tests.xctest */,
                                3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */,
                                BEAA002B202A832500E51F45 /* TrustedPeersHelper.xpc */,
-                               478D429C1FD72A8100CAB645 /* secdxctests_mac.xctest */,
                                EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */,
                                47C2F1832059CB680062DE30 /* KeychainResources.bundle */,
                                4718AE2D205B39620068EC3F /* securityd */,
                                4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */,
                                EB49B2AE202D877F003F34A0 /* secdmockaks.xctest */,
                                47C2F1832059CB680062DE30 /* KeychainResources.bundle */,
                                4718AE2D205B39620068EC3F /* securityd */,
                                4718AEE2205B39C40068EC3F /* libsecurityd_bridge.a */,
-                               0CF406502072E3E3003D6A7F /* SignInAnalyticsTests_ios.xctest */,
-                               0C9AEEB720783FBB00BF6237 /* SignInAnalyticsTests_osx.xctest */,
                                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */,
                                DC0EF8EF208697C600AB9E95 /* tpctl */,
                                BED987D32099145300607A5F /* TrustedPeersHelperUnitTests.xctest */,
                                DAE40BCE20CF3E47002D5674 /* secitemcanarytest */,
                                DC0EF8EF208697C600AB9E95 /* tpctl */,
                                BED987D32099145300607A5F /* TrustedPeersHelperUnitTests.xctest */,
@@ -18802,6 +18946,12 @@
                                DA41FE0E2241ADC000838FB3 /* otpaird */,
                                EBB851EC22F7912400424FD0 /* SecurityUtilitiesTests.xctest */,
                                5A442F90233C330F00918373 /* experimentTool */,
                                DA41FE0E2241ADC000838FB3 /* otpaird */,
                                EBB851EC22F7912400424FD0 /* SecurityUtilitiesTests.xctest */,
                                5A442F90233C330F00918373 /* experimentTool */,
+                               0CD743A623C3EC8000FA0EC5 /* OctagonTrust.framework */,
+                               6C7BE2E723C3DD64003BB2CA /* securitytool_bridge */,
+                               0CCC227923F357EE00E1FCD0 /* OctagonTrustTests.xctest */,
+                               6C2045EA2424BA7E00F9461D /* KeychainStasher */,
+                               6C963281242A279B00C53CE2 /* stashtester */,
+                               3E88361124F068EF00E9F4D6 /* secseccodeapitest */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -19092,6 +19242,17 @@
                        path = secacltests;
                        sourceTree = "<group>";
                };
                        path = secacltests;
                        sourceTree = "<group>";
                };
+               6C0535F422B7043B0064BA50 /* TestHostBinaries */ = {
+                       isa = PBXGroup;
+                       children = (
+                               6CB5F4791E402E5700DBF3F0 /* KeychainEntitledTestRunner.entitlements */,
+                               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp */,
+                               6CB5F4771E402D6D00DBF3F0 /* KeychainEntitledTestRunner */,
+                       );
+                       name = TestHostBinaries;
+                       path = tests/TestHostBinaries;
+                       sourceTree = "<group>";
+               };
                6C34464D1E2534C200F9522B /* analytics */ = {
                        isa = PBXGroup;
                        children = (
                6C34464D1E2534C200F9522B /* analytics */ = {
                        isa = PBXGroup;
                        children = (
@@ -19115,6 +19276,14 @@
                        path = analytics;
                        sourceTree = "<group>";
                };
                        path = analytics;
                        sourceTree = "<group>";
                };
+               6C534E0422C3E52600D4781F /* Discovery Plists */ = {
+                       isa = PBXGroup;
+                       children = (
+                       );
+                       name = "Discovery Plists";
+                       path = "tests/Discovery Plists";
+                       sourceTree = "<group>";
+               };
                6C69517B1F758E1000F68F91 /* supd */ = {
                        isa = PBXGroup;
                        children = (
                6C69517B1F758E1000F68F91 /* supd */ = {
                        isa = PBXGroup;
                        children = (
@@ -19128,6 +19297,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>";
@@ -19157,10 +19327,11 @@
                6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */ = {
                        isa = PBXGroup;
                        children = (
                6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */ = {
                        isa = PBXGroup;
                        children = (
-                               6C2008EF220BB4B500674B3A /* Entitlements.plist */,
-                               6C02134F21F7ED45009D5C80 /* Info.plist */,
+                               6C6579FC2394878700701C8B /* SecDbBackupTestsBase.m */,
+                               6CD224E7239493E8001B70FD /* SecDbBackupTestsBase.h */,
                                6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */,
                                6C02134D21F7ED16009D5C80 /* SecDbBackupTests.m */,
-                               6C02134C21F7ED16009D5C80 /* SecDbBackupTests.plist */,
+                               6C02134F21F7ED45009D5C80 /* Info.plist */,
+                               6C2008EF220BB4B500674B3A /* SecDbBackupTests-Entitlements.plist */,
                        );
                        name = SecDbBackupTests;
                        path = tests/SecDbBackupTests;
                        );
                        name = SecDbBackupTests;
                        path = tests/SecDbBackupTests;
@@ -19183,6 +19354,31 @@
                        path = generated_source;
                        sourceTree = "<group>";
                };
                        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 = (
@@ -19192,13 +19388,12 @@
                        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 */ = {
                        sourceTree = "<group>";
                };
                6CB6CBFE2198D40B0080AD6F /* SecDbBackupManager-protobufs */ = {
@@ -19210,7 +19405,7 @@
                        path = "SecDbBackupManager-protobufs";
                        sourceTree = "<group>";
                };
                        path = "SecDbBackupManager-protobufs";
                        sourceTree = "<group>";
                };
-               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */ = {
+               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp */ = {
                        isa = PBXGroup;
                        children = (
                                6CF4A0B61E45488B00ECD7B5 /* AppDelegate.h */,
                        isa = PBXGroup;
                        children = (
                                6CF4A0B61E45488B00ECD7B5 /* AppDelegate.h */,
@@ -19221,8 +19416,7 @@
                                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 */ = {
@@ -19233,29 +19427,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 */,
-                               6CF4A0EE1E4549F300ECD7B5 /* Assets.xcassets */,
-                               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 = (
@@ -19356,6 +19527,11 @@
                BE3405A21FD71CDE00933DAC /* generated */ = {
                        isa = PBXGroup;
                        children = (
                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 */,
                                0C89BDA121554DD3003F3CC0 /* OTAccountMetadataClassC.h */,
                                0C89BDA021554DD2003F3CC0 /* OTAccountMetadataClassC.m */,
                                0C9AE28B214054F5003BFDB5 /* OTApplicantToSponsorRound2M1.h */,
@@ -19435,8 +19611,8 @@
                BEAA002C202A832500E51F45 /* TrustedPeersHelper */ = {
                        isa = PBXGroup;
                        children = (
                BEAA002C202A832500E51F45 /* TrustedPeersHelper */ = {
                        isa = PBXGroup;
                        children = (
-                               0CE15E29222DF5FF00B7EAA4 /* RecoveryKey */,
                                DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */,
                                DCB0C28F222F5DF80083AECB /* CuttlefishErrors.swift */,
+                               0CE15E29222DF5FF00B7EAA4 /* RecoveryKey */,
                                0C3BB3312187EC4D0018FC14 /* Categories */,
                                0C0C4F80216FB53A00C14C61 /* BottledPeer */,
                                BE9F4F852072D834004A52C2 /* Cuttlefish Client */,
                                0C3BB3312187EC4D0018FC14 /* Categories */,
                                0C0C4F80216FB53A00C14C61 /* BottledPeer */,
                                BE9F4F852072D834004A52C2 /* Cuttlefish Client */,
@@ -19446,8 +19622,11 @@
                                BE55C77B2044D0C90045863D /* Client.swift */,
                                BE9F8D0F206C099800B53D16 /* Container.swift */,
                                DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */,
                                BE55C77B2044D0C90045863D /* Client.swift */,
                                BE9F8D0F206C099800B53D16 /* Container.swift */,
                                DC3A9B2523A9D6120073ED06 /* Container_BottledPeers.swift */,
-                               DCAA209823AAF8BD00DCB594 /* Container_RecoveryKey.swift */,
+                               0C0CB73723AD71400020C6BF /* Container_EscrowRecords.swift */,
                                DCAD8F8422C43EAD007C3872 /* Container_MachineIDs.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 */,
                                BE9F8D18206C4AD300B53D16 /* ContainerMap.swift */,
                                BE9F8D11206C121400B53D16 /* Decrypter.swift */,
                                BECFA43C20F9493000B11002 /* Policy.swift */,
@@ -19462,6 +19641,7 @@
                                0CB582BA218915010040C5F2 /* proto */,
                                DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */,
                                DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */,
                                0CB582BA218915010040C5F2 /* proto */,
                                DC391FA521C04D1500772585 /* OctagonPeerKeys.swift */,
                                DCF6320421C074F30030CCC0 /* CuttlefishAPIHelpers.swift */,
+                               DCBDA460245A39A300B0938B /* com.apple.TrustedPeersHelper.sb */,
                        );
                        path = TrustedPeersHelper;
                        sourceTree = "<group>";
                        );
                        path = TrustedPeersHelper;
                        sourceTree = "<group>";
@@ -19533,6 +19713,8 @@
                                BEF88C5B1EB0005E00357577 /* TPPolicy.m */,
                                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */,
                                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */,
                                BEF88C5B1EB0005E00357577 /* TPPolicy.m */,
                                BEF88C5C1EB0005E00357577 /* TPPolicyDocument.h */,
                                BEF88C5D1EB0005E00357577 /* TPPolicyDocument.m */,
+                               DCC03FA223FF521100A4DA3F /* TPSyncingPolicy.h */,
+                               DCC03FA323FF521100A4DA3F /* TPSyncingPolicy.m */,
                                BEF88C5E1EB0005E00357577 /* TPKey.h */,
                                BECFA46320FFB87400B11002 /* TPKey.m */,
                                BEF88C5F1EB0005E00357577 /* TPTypes.h */,
                                BEF88C5E1EB0005E00357577 /* TPKey.h */,
                                BECFA46320FFB87400B11002 /* TPKey.m */,
                                BEF88C5F1EB0005E00357577 /* TPTypes.h */,
@@ -19687,7 +19869,6 @@
                                D458C4CA214E1A420043D982 /* AppDelegate.m */,
                                D458C4C8214E1A410043D982 /* AppDelegate.h */,
                                D458C4C5214E1A400043D982 /* Assets.xcassets */,
                                D458C4CA214E1A420043D982 /* AppDelegate.m */,
                                D458C4C8214E1A410043D982 /* AppDelegate.h */,
                                D458C4C5214E1A400043D982 /* Assets.xcassets */,
-                               D458C4C7214E1A400043D982 /* Base.lproj */,
                                D458C4CC214E1A420043D982 /* Info.plist */,
                                D458C4C6214E1A400043D982 /* main.m */,
                                D458C4CB214E1A420043D982 /* trusttests_entitlements.plist */,
                                D458C4CC214E1A420043D982 /* Info.plist */,
                                D458C4C6214E1A400043D982 /* main.m */,
                                D458C4CB214E1A420043D982 /* trusttests_entitlements.plist */,
@@ -19710,6 +19891,7 @@
                                D4A0F8BB211E69CB00443CA1 /* TestMacroConversions.h */,
                                D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */,
                                D4A7946D22D7DD6E00D1B2B7 /* TrustEvaluationTestHelpers.h */,
                                D4A0F8BB211E69CB00443CA1 /* TestMacroConversions.h */,
                                D44282FE22D68556001746B3 /* TrustEvaluationTestHelpers.m */,
                                D4A7946D22D7DD6E00D1B2B7 /* TrustEvaluationTestHelpers.h */,
+                               EB45ED2E24749DE9008A1F6F /* gen_test_plist.py */,
                        );
                        name = TrustTests;
                        sourceTree = "<group>";
                        );
                        name = TrustTests;
                        sourceTree = "<group>";
@@ -19720,8 +19902,9 @@
                                D4EA5CF622B225C000883439 /* LoggingServerTests.m */,
                                D49A370B23877ECC0065719F /* OCSPCacheTests.m */,
                                D4BA4FD22388687A000B9E64 /* OCSPCacheTests_data.h */,
                                D4EA5CF622B225C000883439 /* LoggingServerTests.m */,
                                D49A370B23877ECC0065719F /* OCSPCacheTests.m */,
                                D4BA4FD22388687A000B9E64 /* OCSPCacheTests_data.h */,
-                               D49A370523873BD30065719F /* TrustDaemonTestCase.m */,
-                               D49A370823873BF10065719F /* TrustDaemonTestCase.h */,
+                               D477CB5B237B6E0E00C02355 /* PersonalizationTests.m */,
+                               D477CB69237CBA2C00C02355 /* TrustDaemonTestCase.m */,
+                               D477CB6D237CBACD00C02355 /* TrustDaemonTestCase.h */,
                        );
                        name = DaemonTests;
                        sourceTree = "<group>";
                        );
                        name = DaemonTests;
                        sourceTree = "<group>";
@@ -19729,6 +19912,10 @@
                D4A0F8BE211E69DF00443CA1 /* EvaluationTests */ = {
                        isa = PBXGroup;
                        children = (
                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 */,
                                D4AC5766214E195300A32C01 /* ECTests.m */,
                                D458C4AA214E198D0043D982 /* CTTests.m */,
                                D4EF3222215F102F000A31A5 /* CTTests_data.h */,
                                D4AC5766214E195300A32C01 /* ECTests.m */,
@@ -19749,12 +19936,16 @@
                                D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */,
                                D4FD4222217D7B48002B7EE2 /* PathScoringTests_data.h */,
                                D458C513214E27620043D982 /* PolicyTests.m */,
                                D4FD421F217D7B27002B7EE2 /* PathScoringTests.m */,
                                D4FD4222217D7B48002B7EE2 /* PathScoringTests_data.h */,
                                D458C513214E27620043D982 /* PolicyTests.m */,
+                               D477CB81237F692400C02355 /* RevocationTests.m */,
+                               D477CB85237F6A0700C02355 /* RevocationTests_data.h */,
                                D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */,
                                D458C4B6214E19AE0043D982 /* SignatureAlgorithmTests_data.h */,
                                D458C4B7214E19AF0043D982 /* SignatureAlgorithmTests.m */,
                                D458C4B6214E19AE0043D982 /* SignatureAlgorithmTests_data.h */,
+                               D423114223725F9F000E470A /* SMIMEPolicyTests.m */,
                                D4056A1922712A650026E24E /* SSLPolicyTests.m */,
                                D4056A1C22712AD80026E24E /* SSLPolicyTests_data.h */,
                                D4056A1922712A650026E24E /* SSLPolicyTests.m */,
                                D4056A1C22712AD80026E24E /* SSLPolicyTests_data.h */,
-                               D49A370023873A570065719F /* RevocationTests.m */,
-                               D49A370223873A570065719F /* RevocationTests_data.h */,
+                               D458DAC22375FEA300E5890E /* TrustSettingsTests.m */,
+                               D458DAC52375FEE900E5890E /* TrustSettingsTests_data.h */,
+                               D477CB8E237F975500C02355 /* ValidTests.m */,
                                D4AC5764214E195200A32C01 /* VerifyDateTests.m */,
                                D4AC5765214E195300A32C01 /* VerifyDateTests_data.h */,
                                D4A0F8CB211E6A8200443CA1 /* TrustEvaluationTestCase.h */,
                                D4AC5764214E195200A32C01 /* VerifyDateTests.m */,
                                D4AC5765214E195300A32C01 /* VerifyDateTests_data.h */,
                                D4A0F8CB211E6A8200443CA1 /* TrustEvaluationTestCase.h */,
@@ -19781,6 +19972,7 @@
                D4A0F8C0211E69F500443CA1 /* TestData */ = {
                        isa = PBXGroup;
                        children = (
                D4A0F8C0211E69F500443CA1 /* TestData */ = {
                        isa = PBXGroup;
                        children = (
+                               D4231147237261F7000E470A /* SMIMEPolicyTests-data */,
                                D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */,
                                D4D92DA72278904F0009A7CF /* nist-certs */,
                                D4AC8BED2132127A006E9871 /* si-18-certificate-parse */,
                                D4B2966822DBFDB100DCF250 /* TestCopyProperties_ios-data */,
                                D4D92DA72278904F0009A7CF /* nist-certs */,
                                D4AC8BED2132127A006E9871 /* si-18-certificate-parse */,
@@ -20418,7 +20610,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;
@@ -20428,6 +20619,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";
@@ -20668,6 +20860,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>";
@@ -20700,8 +20893,6 @@
                                DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */,
                                EB3FBBF42320629400DF52EA /* SecABC.h */,
                                EB3FBBF52320629400DF52EA /* SecABC.m */,
                                DC0BCC3B1D8C68CF00070CB0 /* iCloudKeychainTrace.h */,
                                EB3FBBF42320629400DF52EA /* SecABC.h */,
                                EB3FBBF52320629400DF52EA /* SecABC.m */,
-                               EBF3749A1DC064200065D840 /* SecADWrapper.c */,
-                               EBF3749B1DC064200065D840 /* SecADWrapper.h */,
                                DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */,
                                DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */,
                                DA5B871A2065A8410093F083 /* SecAutorelease.h */,
                                DC0BCC3C1D8C68CF00070CB0 /* SecAKSWrappers.c */,
                                DC0BCC3D1D8C68CF00070CB0 /* SecAKSWrappers.h */,
                                DA5B871A2065A8410093F083 /* SecAutorelease.h */,
@@ -20735,6 +20926,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 */,
@@ -20750,6 +20942,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 */,
@@ -20763,6 +20957,7 @@
                                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 */,
                                DC0BCC6D1D8C68CF00070CB0 /* SecFileLocations.c */,
                                DC0BCC6E1D8C68CF00070CB0 /* SecFileLocations.h */,
                                DC0BCC6F1D8C68CF00070CB0 /* SecXPCError.h */,
@@ -20786,6 +20981,7 @@
                        children = (
                                DCC78E281D8085FC00865A7C /* AppleBaselineEscrowCertificates.h */,
                                D41149A01E7C935D00C078C7 /* AppleiPhoneDeviceCACertificates.h */,
                        children = (
                                DCC78E281D8085FC00865A7C /* AppleBaselineEscrowCertificates.h */,
                                D41149A01E7C935D00C078C7 /* AppleiPhoneDeviceCACertificates.h */,
+                               D47A085B2486EC1A000F2C49 /* AppleExternalRootCertificates.h */,
                                DCC78E301D8085FC00865A7C /* SecAccessControl.m */,
                                443381DA18A3D81400215606 /* SecAccessControlPriv.h */,
                                DCC78E351D8085FC00865A7C /* SecBase64.c */,
                                DCC78E301D8085FC00865A7C /* SecAccessControl.m */,
                                443381DA18A3D81400215606 /* SecAccessControlPriv.h */,
                                DCC78E351D8085FC00865A7C /* SecBase64.c */,
@@ -20814,6 +21010,9 @@
                                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 */,
                                52AA92881E662A4A004301A6 /* SecBackupKeybagEntry.m */,
                                52AA92871E662A4A004301A6 /* SecBackupKeybagEntry.h */,
                                DCC78E5C1D8085FC00865A7C /* SecItemConstants.c */,
@@ -20862,6 +21061,7 @@
                                DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */,
                                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */,
                                DCC78E8C1D8085FC00865A7C /* SecSharedCredential.c */,
                                DCC78E8A1D8085FC00865A7C /* SecServerEncryptionSupport.c */,
                                E7676DB519411DF300498DD4 /* SecServerEncryptionSupport.h */,
                                DCC78E8C1D8085FC00865A7C /* SecSharedCredential.c */,
+                               BE7B8E112415579800E1CF4F /* SecSharedCredential.m */,
                                DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */,
                                DCC78E8F1D8085FC00865A7C /* SecSignatureVerificationSupport.h */,
                                DCC78E901D8085FC00865A7C /* SecTrust.c */,
                                DCC78E8E1D8085FC00865A7C /* SecSignatureVerificationSupport.c */,
                                DCC78E8F1D8085FC00865A7C /* SecSignatureVerificationSupport.h */,
                                DCC78E901D8085FC00865A7C /* SecTrust.c */,
@@ -20963,21 +21163,9 @@
                        name = headers;
                        sourceTree = "<group>";
                };
                        name = 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 */,
@@ -21019,7 +21207,6 @@
                                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 */,
                                DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */,
                                DC178A381D77A1F500B50D50 /* InfoPlist.strings */,
                                DC178A3A1D77A1F500B50D50 /* TimeStampingPrefs.plist */,
                                DC178A3B1D77A1F500B50D50 /* authorization.dfr.prompts.strings */,
@@ -21106,6 +21293,8 @@
                                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 */,
                                DC62DC6E22A8721C000D2D5D /* CKKSTests+MultiZone.h */,
                                DC62DC6B22A87128000D2D5D /* CKKSTests+MultiZone.m */,
                                EBC1023022EBF8AC0083D356 /* CKKSTests+LockStateTracker.m */,
@@ -21140,6 +21329,7 @@
                                DCE7F2081F21726500DDB0F7 /* OctagonAPSReceiverTests.m */,
                                DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */,
                                EB0E1AD723576273002B6037 /* CKKSPBFileStorageTests.m */,
                                DCE7F2081F21726500DDB0F7 /* OctagonAPSReceiverTests.m */,
                                DC9C95951F748D0B000D19E5 /* CKKSServerValidationRecoveryTests.m */,
                                EB0E1AD723576273002B6037 /* CKKSPBFileStorageTests.m */,
+                               EB45ED3024749E63008A1F6F /* gen_test_plist.py */,
                        );
                        name = "Tests (Local)";
                        path = tests;
                        );
                        name = "Tests (Local)";
                        path = tests;
@@ -21163,6 +21353,7 @@
                                DC8506A42097E8CF00C712EC /* iOS Resources */,
                                DCC78E1C1D8085FC00865A7C /* add_internet_password.c */,
                                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */,
                                DC8506A42097E8CF00C712EC /* iOS Resources */,
                                DCC78E1C1D8085FC00865A7C /* add_internet_password.c */,
                                DC52EA8E1D80CC2A00B0A59C /* builtin_commands.h */,
+                               BE57B1162509E0FF0045B7FD /* ca_revocation_additions.m */,
                                DCC78E1E1D8085FC00865A7C /* codesign.c */,
                                D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */,
                                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */,
                                DCC78E1E1D8085FC00865A7C /* codesign.c */,
                                D4A3A596217A85CB00F0A8DA /* ct_exceptions.m */,
                                DC52EA8F1D80CC2A00B0A59C /* digest_calc.c */,
@@ -21532,6 +21723,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>";
@@ -21664,6 +21857,8 @@
                DC5AC2011D83663C00CF422C /* tests */ = {
                        isa = PBXGroup;
                        children = (
                DC5AC2011D83663C00CF422C /* tests */ = {
                        isa = PBXGroup;
                        children = (
+                               6C534E0422C3E52600D4781F /* Discovery Plists */,
+                               6C0535F422B7043B0064BA50 /* TestHostBinaries */,
                                EBDAF14021C75FC800EAE89F /* SharedMocks */,
                                DC05037721409A4100A8EDB7 /* OCMockUmbrella */,
                                F667EC541E96E8C800203D5C /* authdtests */,
                                EBDAF14021C75FC800EAE89F /* SharedMocks */,
                                DC05037721409A4100A8EDB7 /* OCMockUmbrella */,
                                F667EC541E96E8C800203D5C /* authdtests */,
@@ -21684,6 +21879,7 @@
                                EB49B2AF202D8780003F34A0 /* secdmockaks */,
                                6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */,
                                D4A0F8B9211E69A800443CA1 /* TrustTests */,
                                EB49B2AF202D8780003F34A0 /* secdmockaks */,
                                6C7E8F1D21F7BD1C008A2D56 /* SecDbBackupTests */,
                                D4A0F8B9211E69A800443CA1 /* TrustTests */,
+                               6C963282242A279B00C53CE2 /* stashtester */,
                        );
                        name = tests;
                        sourceTree = "<group>";
                        );
                        name = tests;
                        sourceTree = "<group>";
@@ -21754,11 +21950,13 @@
                        isa = PBXGroup;
                        children = (
                                0CDBCD8620AD03FB007F8EA7 /* OTClique.h */,
                        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 */,
                                0C2F336A20DD643B0031A92D /* OTClique.m */,
                                0C8BBF0B1FCB452200580909 /* OTControl.h */,
                                0C8BBF0E1FCB452400580909 /* OTControl.m */,
                                EB10A3E320356E2000E84270 /* OTConstants.h */,
                                EB10A3E420356E2000E84270 /* OTConstants.m */,
+                               0C0203DE23A855B8005D0A68 /* proto */,
                        );
                        name = Framework;
                        sourceTree = "<group>";
                        );
                        name = Framework;
                        sourceTree = "<group>";
@@ -21873,15 +22071,16 @@
                        isa = PBXGroup;
                        children = (
                                6C34464D1E2534C200F9522B /* analytics */,
                        isa = PBXGroup;
                        children = (
                                6C34464D1E2534C200F9522B /* analytics */,
-                               0C7CEA391FE9CE3900125C79 /* behavior */,
                                DCAE1DCF2073FCA400B4F687 /* categories */,
                                EB27FF051E402C3C00EC9E3A /* ckksctl */,
                                DCAE1DCF2073FCA400B4F687 /* categories */,
                                EB27FF051E402C3C00EC9E3A /* ckksctl */,
+                               0CD743A723C3EC8000FA0EC5 /* OctagonTrust */,
                                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */,
                                470D96651FCDE45C0065FE90 /* CoreDataKeychain */,
                                4771D974209A755800BA9772 /* KeychainDataclassOwner */,
                                47C2F1852059CB680062DE30 /* KeychainResources */,
                                EB74CC182207E48000F1BBAD /* KeychainSettings */,
                                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */,
                                470D96651FCDE45C0065FE90 /* CoreDataKeychain */,
                                4771D974209A755800BA9772 /* KeychainDataclassOwner */,
                                47C2F1852059CB680062DE30 /* KeychainResources */,
                                EB74CC182207E48000F1BBAD /* KeychainSettings */,
-                               0C8BBE831FC9DA1700580909 /* Octagon Trust */,
+                               6C997868242362EC008C498D /* KeychainStasher */,
+                               0C8BBE831FC9DA1700580909 /* OT */,
                                0C8BBEF61FCB402900580909 /* otctl */,
                                DA41FDFC2241A7CD00838FB3 /* otpaird */,
                                DC90A4BD21F275EC001300EB /* escrowrequest */,
                                0C8BBEF61FCB402900580909 /* otctl */,
                                DA41FDFC2241A7CD00838FB3 /* otpaird */,
                                DC90A4BD21F275EC001300EB /* escrowrequest */,
@@ -22003,14 +22202,6 @@
                        path = OSX/libsecurity_asn1/lib;
                        sourceTree = "<group>";
                };
                        path = OSX/libsecurity_asn1/lib;
                        sourceTree = "<group>";
                };
-               DC88467E223742CA00738068 /* View Matching */ = {
-                       isa = PBXGroup;
-                       children = (
-                       );
-                       name = "View Matching";
-                       path = view_matching;
-                       sourceTree = "<group>";
-               };
                DC90A4BD21F275EC001300EB /* escrowrequest */ = {
                        isa = PBXGroup;
                        children = (
                DC90A4BD21F275EC001300EB /* escrowrequest */ = {
                        isa = PBXGroup;
                        children = (
@@ -22047,10 +22238,11 @@
                DC99B89720EAD4D20065B73B /* Octagon */ = {
                        isa = PBXGroup;
                        children = (
                DC99B89720EAD4D20065B73B /* Octagon */ = {
                        isa = PBXGroup;
                        children = (
-                               DCC0A4C52152C4AB000AF654 /* Pairing */,
-                               DC27C3C820EADD8200F7839C /* OctagonTests-BridgingHeader.h */,
+                               DCEA0FF6213F1E6F0054A328 /* Octagon.plist */,
+                               DC7EB928211E20DF00516452 /* OctagonDataPersistenceTests.swift */,
                                DC85687C2284E7850088D3EF /* OctagonTestMocks.swift */,
                                DC85687C2284E7850088D3EF /* OctagonTestMocks.swift */,
-                               DC4CD9822372294D00EF55FC /* OctagonTests+Helpers.swift */,
+                               DC27C3C820EADD8200F7839C /* OctagonTests-BridgingHeader.h */,
+                               DC99B89320EACA480065B73B /* OctagonTests-Info.plist */,
                                DC27C3C020EAD9C300F7839C /* OctagonTests.swift */,
                                DC4415B323610BF40087981C /* OctagonTests+Account.swift */,
                                DC7F79B522EA4ED4001FB69A /* OctagonTests+CKKS.swift */,
                                DC27C3C020EAD9C300F7839C /* OctagonTests.swift */,
                                DC4415B323610BF40087981C /* OctagonTests+Account.swift */,
                                DC7F79B522EA4ED4001FB69A /* OctagonTests+CKKS.swift */,
@@ -22058,21 +22250,23 @@
                                DC5BEACC2217509A001681F0 /* OctagonTests+CloudKitAccount.swift */,
                                DC5F2BBD2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift */,
                                DC2819B822F8F6FE007829F5 /* OctagonTests+DeviceList.swift */,
                                DC5BEACC2217509A001681F0 /* OctagonTests+CloudKitAccount.swift */,
                                DC5F2BBD2310B941001ADA5D /* OctagonTests+CoreFollowUp.swift */,
                                DC2819B822F8F6FE007829F5 /* OctagonTests+DeviceList.swift */,
-                               DC7F6A7C233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift */,
-                               0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */,
                                DC07090222936BCC002711B9 /* OctagonTests+ErrorHandling.swift */,
                                DC07090222936BCC002711B9 /* OctagonTests+ErrorHandling.swift */,
+                               0CBF883A23AAD9DC00652EDD /* OctagonTests+EscrowRecords.swift */,
                                DCDF03112284E34B008055BA /* OctagonTests+EscrowRecovery.swift */,
                                DCDF03112284E34B008055BA /* OctagonTests+EscrowRecovery.swift */,
+                               DC7F6A7C233D7FAC00DF5769 /* OctagonTests+ForwardCompatibility.swift */,
                                0C5824A322860001009E8C15 /* OctagonTests+HealthCheck.swift */,
                                0C5824A322860001009E8C15 /* OctagonTests+HealthCheck.swift */,
+                               DC4CD9822372294D00EF55FC /* OctagonTests+Helpers.swift */,
+                               0C4CDE6D22922E360050C499 /* OctagonTests+RecoveryKey.swift */,
                                DC72502D229600A800493D88 /* OctagonTests+Reset.swift */,
                                DC72502D229600A800493D88 /* OctagonTests+Reset.swift */,
-                               DCB947592127534C00ED9272 /* OctagonTests+SOSUpgrade.swift */,
                                0C87D3E2229368A7007853B5 /* OctagonTests+SOS.swift */,
                                0C87D3E2229368A7007853B5 /* OctagonTests+SOS.swift */,
-                               DC7EB928211E20DF00516452 /* OctagonDataPersistenceTests.swift */,
-                               DC99B89320EACA480065B73B /* OctagonTests-Info.plist */,
-                               DCEA0FF6213F1E6F0054A328 /* Octagon.plist */,
-                               5A04BAF922973EA9001848A0 /* OTFollowupTests.m */,
+                               DCB947592127534C00ED9272 /* OctagonTests+SOSUpgrade.swift */,
+                               0CA1D0B223E9023100021038 /* OctagonTests+EscrowTestVectors.swift */,
                                DCFF82702162834C00D54B02 /* OctagonTestsXPCConnections.swift */,
                                DCFF82702162834C00D54B02 /* OctagonTestsXPCConnections.swift */,
+                               5A04BAF922973EA9001848A0 /* OTFollowupTests.m */,
+                               DCC0A4C52152C4AB000AF654 /* Pairing */,
                                0CBEF3422242C9BE00015691 /* TestsObjcTranslation.h */,
                                0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */,
                                0CBEF3422242C9BE00015691 /* TestsObjcTranslation.h */,
                                0CBEF3412242C9AE00015691 /* TestsObjcTranslation.m */,
+                               DCA7F7EE23A44AA200927989 /* OctagonPolicyTests.swift */,
                        );
                        name = Octagon;
                        path = octagon;
                        );
                        name = Octagon;
                        path = octagon;
@@ -22081,16 +22275,17 @@
                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */ = {
                        isa = PBXGroup;
                        children = (
                DC9B7AD31DCBF336004E9385 /* CloudKit Syncing */ = {
                        isa = PBXGroup;
                        children = (
-                               DC88467E223742CA00738068 /* View Matching */,
                                DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */,
                                DCD662F21E3294DE00188186 /* CloudKit Support */,
                                DCFE1C311F17ECC3007640C8 /* dispatch Support */,
                                DCD662EB1E32946000188186 /* Sync Objects */,
                                DCD662F11E32946E00188186 /* Operations */,
                                DC3502B61E0208BE00BC0587 /* Tests (Local) */,
                                DC9FD3161F857FF800C8AAC8 /* Protocol Buffers */,
                                DCD662F21E3294DE00188186 /* CloudKit Support */,
                                DCFE1C311F17ECC3007640C8 /* dispatch Support */,
                                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 */,
                                DC391F9921BF2F4B00772585 /* CKKSConstants.m */,
                                DCF7A89F1F04502300CABE89 /* CKKSControlProtocol.h */,
                                DCF7A8A21F0450EB00CABE89 /* CKKSControlProtocol.m */,
@@ -22143,19 +22338,6 @@
                        path = generated_source;
                        sourceTree = "<group>";
                };
                        path = generated_source;
                        sourceTree = "<group>";
                };
-               DCA4D2121E5651950056214F /* Tests (Live CloudKit) */ = {
-                       isa = PBXGroup;
-                       children = (
-                               6CF4A0B51E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */,
-                               6CF4A0E11E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */,
-                               6CB5F4771E402D6D00DBF3F0 /* testrunner */,
-                               6CCDF7911E3C2D69003F2555 /* CKKSCloudKitTests.m */,
-                               6CB5F4751E4025AB00DBF3F0 /* CKKSCloudKitTestsInfo.plist */,
-                       );
-                       name = "Tests (Live CloudKit)";
-                       path = tests;
-                       sourceTree = "<group>";
-               };
                DCA4D2191E569FFE0056214F /* Helpers */ = {
                        isa = PBXGroup;
                        children = (
                DCA4D2191E569FFE0056214F /* Helpers */ = {
                        isa = PBXGroup;
                        children = (
@@ -22163,6 +22345,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 */,
@@ -22462,7 +22646,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 */,
@@ -22495,7 +22678,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 */,
@@ -22511,6 +22693,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>";
@@ -22553,7 +22737,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 */,
@@ -22731,64 +22914,68 @@
                        children = (
                                1BB1CAB6232C05BC001D0C71 /* CuttlefishXPCWrapper.h */,
                                1BB1CAB4232C05BB001D0C71 /* CuttlefishXPCWrapper.m */,
                        children = (
                                1BB1CAB6232C05BC001D0C71 /* CuttlefishXPCWrapper.h */,
                                1BB1CAB4232C05BB001D0C71 /* CuttlefishXPCWrapper.m */,
-                               DCB946AD22FCB88400BE4490 /* OTDetermineHSA2AccountStatusOperation.h */,
-                               DCB946AE22FCB88500BE4490 /* OTDetermineHSA2AccountStatusOperation.m */,
                                DCE772642290712F005862B4 /* OctagonCheckTrustStateOperation.h */,
                                DCE772652290712F005862B4 /* OctagonCheckTrustStateOperation.m */,
                                DCE772642290712F005862B4 /* OctagonCheckTrustStateOperation.h */,
                                DCE772652290712F005862B4 /* OctagonCheckTrustStateOperation.m */,
-                               DC047085218BCEF20078BDAA /* OTOperationDependencies.h */,
-                               DC047086218BCEF20078BDAA /* OTOperationDependencies.m */,
-                               1B5EAAD92252ABCC008D27E7 /* OTFetchViewsOperation.h */,
-                               1B5EAADB2252ABCC008D27E7 /* OTFetchViewsOperation.m */,
-                               DCBFF830222611A200C5C044 /* OTFetchCKKSKeysOperation.h */,
-                               DCBFF831222611A200C5C044 /* OTFetchCKKSKeysOperation.m */,
-                               DCF12671218A7579000124C6 /* OTLeaveCliqueOperation.h */,
-                               DCF12672218A757A000124C6 /* OTLeaveCliqueOperation.m */,
-                               DC221BA92267E2A60068DBCF /* OTUpdateTPHOperation.h */,
-                               DC221BAA2267E2A60068DBCF /* OTUpdateTPHOperation.m */,
-                               DCF46C2C214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.h */,
-                               DCF46C2D214B1E0700319A93 /* OTUpdateTrustedDeviceListOperation.m */,
-                               DC6DE897213076C000C6B56D /* OTSOSUpgradeOperation.h */,
-                               DC6DE898213076C000C6B56D /* OTSOSUpgradeOperation.m */,
-                               DC93F02722387A010072720A /* OTSOSUpdatePreapprovalsOperation.h */,
-                               DC93F02822387A010072720A /* OTSOSUpdatePreapprovalsOperation.m */,
-                               DCC67E2B20DDC07900A70A31 /* OTPrepareOperation.h */,
-                               DCC67E2C20DDC07900A70A31 /* OTPrepareOperation.m */,
-                               0C4F4DE121153659007F7E20 /* OTEpochOperation.h */,
-                               0C4F4DDA211535E8007F7E20 /* OTEpochOperation.m */,
+                               0CA7020B2280D99D0085AC54 /* OTCheckHealthOperation.h */,
+                               0CA702082280D5600085AC54 /* OTCheckHealthOperation.m */,
                                0CC8A9002123AA3B005D7F6A /* OTClientVoucherOperation.h */,
                                0CC8A8FA2123A9EB005D7F6A /* OTClientVoucherOperation.m */,
                                0CC8A9002123AA3B005D7F6A /* OTClientVoucherOperation.h */,
                                0CC8A8FA2123A9EB005D7F6A /* OTClientVoucherOperation.m */,
-                               0CC8A9052123AF16005D7F6A /* OTJoinWithVoucherOperation.h */,
-                               0CC8A9012123AEF7005D7F6A /* OTJoinWithVoucherOperation.m */,
-                               0C66046E2134985100BFBBB8 /* OTEstablishOperation.h */,
-                               0C6604692134983900BFBBB8 /* OTEstablishOperation.m */,
-                               DC0D15FF2363A1D6007F0951 /* OTSetCDPBitOperation.h */,
-                               DC0D16002363A1D6007F0951 /* OTSetCDPBitOperation.m */,
                                DC0D16042363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h */,
                                DC0D16052363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m */,
                                DC0D16042363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.h */,
                                DC0D16052363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m */,
-                               DCFF82722162876400D54B02 /* OTResetOperation.h */,
-                               DCFF82732162876400D54B02 /* OTResetOperation.m */,
-                               0C00FC85217A972E00C8BF00 /* OTLocalCuttlefishReset.h */,
-                               0C00FC81217A971800C8BF00 /* OTLocalCuttlefishReset.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 */,
                                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 */,
                                DC8757F2218D2003000E65F1 /* OTRemovePeersOperation.h */,
                                DC8757F3218D2003000E65F1 /* OTRemovePeersOperation.m */,
-                               DCC5417F225C05170095D926 /* OTUploadNewCKKSTLKsOperation.h */,
-                               DCC54180225C05180095D926 /* OTUploadNewCKKSTLKsOperation.m */,
                                DC7250352296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h */,
                                DC7250362296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m */,
                                DC7250352296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.h */,
                                DC7250362296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m */,
-                               0CB8DC962194B1300021A7C8 /* OTVouchWithBottleOperation.h */,
-                               0CB8DC992194B1440021A7C8 /* OTVouchWithBottleOperation.m */,
-                               0C1B8BB3223323710094D5DA /* OTVouchWithRecoveryKeyOperation.h */,
-                               0C1B8BB52233241E0094D5DA /* OTVouchWithRecoveryKeyOperation.m */,
+                               DCFF82722162876400D54B02 /* OTResetOperation.h */,
+                               DCFF82732162876400D54B02 /* OTResetOperation.m */,
+                               DC0D15FF2363A1D6007F0951 /* OTSetCDPBitOperation.h */,
+                               DC0D16002363A1D6007F0951 /* OTSetCDPBitOperation.m */,
                                0CD3D518224047B400024755 /* OTSetRecoveryKeyOperation.h */,
                                0CD3D5152240479600024755 /* OTSetRecoveryKeyOperation.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 */,
                                0CDD6F78226E62BC009094C2 /* OTTriggerEscrowUpdateOperation.h */,
                                0CDD6F76226E62AD009094C2 /* OTTriggerEscrowUpdateOperation.m */,
-                               0CA7020B2280D99D0085AC54 /* OTCheckHealthOperation.h */,
-                               0CA702082280D5600085AC54 /* OTCheckHealthOperation.m */,
-                               0C87D3DA229326CB007853B5 /* OTEnsureOctagonKeyConsistency.h */,
-                               0C87D3D6229326A2007853B5 /* OTEnsureOctagonKeyConsistency.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>";
                        );
                        name = Operations;
                        sourceTree = "<group>";
@@ -22840,6 +23027,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 */,
@@ -22867,7 +23055,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 */,
@@ -22904,6 +23091,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 */,
@@ -23256,23 +23445,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 = (
@@ -23288,8 +23460,6 @@
                                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 */,
@@ -23297,8 +23467,6 @@
                                DC0B62261D90973900D43BCB /* si-25-cms-skid.h */,
                                DC0B62271D90973900D43BCB /* si-25-cms-skid.m */,
                                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */,
                                DC0B62261D90973900D43BCB /* si-25-cms-skid.h */,
                                DC0B62271D90973900D43BCB /* si-25-cms-skid.m */,
                                DCC78DC61D8085FC00865A7C /* si-26-sectrust-copyproperties.c */,
-                               DCC78DC81D8085FC00865A7C /* si-28-sectrustsettings.m */,
-                               DCC78DC91D8085FC00865A7C /* si-28-sectrustsettings.h */,
                                D4AA0D9922FB959600D77FA4 /* si-29-cms-chain-mode.m */,
                                D4AA0D9C22FB962300D77FA4 /* si-29-cms-chain-mode.h */,
                                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */,
                                D4AA0D9922FB959600D77FA4 /* si-29-cms-chain-mode.m */,
                                D4AA0D9C22FB962300D77FA4 /* si-29-cms-chain-mode.h */,
                                DCC78DCA1D8085FC00865A7C /* si-30-keychain-upgrade.c */,
@@ -23336,23 +23504,18 @@
                                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 */,
                                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */,
                                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */,
                                DCC78DFF1D8085FC00865A7C /* si-76-shared-credentials.c */,
                                DCC78E001D8085FC00865A7C /* si_77_SecAccessControl.c */,
                                DCC78E011D8085FC00865A7C /* si-78-query-attrs.c */,
                                DCC78E021D8085FC00865A7C /* si-80-empty-data.c */,
                                DCC78E051D8085FC00865A7C /* si-82-token-ag.c */,
                                DCC78E061D8085FC00865A7C /* si-83-seccertificate-sighashalg.c */,
-                               BE6215BD1DB6E69100961E15 /* si-84-sectrust-allowlist.m */,
-                               BE9B8B49202BB4A10081EF87 /* si-88-sectrust-valid.m */,
                                DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */,
                                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */,
                                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */,
                                DCC78E0B1D8085FC00865A7C /* si-89-cms-hash-agility.m */,
                                DCC78E0D1D8085FC00865A7C /* si-90-emcs.m */,
                                DCC78E0E1D8085FC00865A7C /* si-95-cms-basic.c */,
@@ -24046,6 +24209,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 */,
@@ -24056,6 +24225,8 @@
                                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 */,
                                DC5F65AC2225C22C0051E9FA /* CKKSProvideKeySetOperation.h */,
                                DC7A17EB1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.h */,
                                DC7A17EC1E36ABC200EF14CE /* CKKSProcessReceivedKeysOperation.m */,
                                DC5F65AC2225C22C0051E9FA /* CKKSProvideKeySetOperation.h */,
@@ -24088,8 +24259,6 @@
                                DC222CA91E08C57400B09171 /* CloudKitDependencies.h */,
                                DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */,
                                DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */,
                                DC222CA91E08C57400B09171 /* CloudKitDependencies.h */,
                                DCEA5D831E2F14810089CF55 /* OctagonAPSReceiver.h */,
                                DCEA5D841E2F14810089CF55 /* OctagonAPSReceiver.m */,
-                               DCEA5D951E3014250089CF55 /* CKKSZone.h */,
-                               DCEA5D961E3014250089CF55 /* CKKSZone.m */,
                                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */,
                                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */,
                                DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */,
                                DC18F76D1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.h */,
                                DC18F76E1E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m */,
                                DCFB12C31E95A4C000510F5F /* CKKSAccountStateTracker.h */,
@@ -24106,23 +24275,23 @@
                        isa = PBXGroup;
                        children = (
                                BE7089991F9AAF57001ACC20 /* generated */,
                        isa = PBXGroup;
                        children = (
                                BE7089991F9AAF57001ACC20 /* generated */,
-                               BE7089911F9AA027001ACC20 /* TPPBVoucher.proto */,
-                               BE7089CB1FA3B19A001ACC20 /* TPPBPeerDynamicInfo.proto */,
+                               BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.proto */,
+                               DC88466922373A4000738068 /* TPPBDictionaryMatchingRule.proto */,
                                BEC3739B20CF2AA200DBDF5B /* TPPBDisposition.proto */,
                                BEC373C120D8224A00DBDF5B /* TPPBDispositionEntry.proto */,
                                BEC3739B20CF2AA200DBDF5B /* TPPBDisposition.proto */,
                                BEC373C120D8224A00DBDF5B /* TPPBDispositionEntry.proto */,
-                               BEC373A820D810DA00DBDF5B /* TPPBAncientEpoch.proto */,
-                               BEC373A620D810D800DBDF5B /* TPPBPolicyProhibits.proto */,
-                               BEC373A720D810D900DBDF5B /* TPPBUnknownMachineID.proto */,
-                               BE7089CC1FA3B332001ACC20 /* TPPBPeerStableInfo.proto */,
+                               BE7089CB1FA3B19A001ACC20 /* TPPBPeerDynamicInfo.proto */,
                                BE7089DB1FA407E4001ACC20 /* TPPBPeerPermanentInfo.proto */,
                                BE7089DB1FA407E4001ACC20 /* TPPBPeerPermanentInfo.proto */,
-                               BE7089D91FA3F0AF001ACC20 /* TPPBPolicySecret.proto */,
+                               BE7089CC1FA3B332001ACC20 /* TPPBPeerStableInfo.proto */,
                                6C0C807D20EAF86100334E33 /* TPPBPolicyDocument.proto */,
                                6C0C807F20EAFB9600334E33 /* TPPBPolicyCategoriesByView.proto */,
                                6C0C808020EAFB9600334E33 /* TPPBPolicyModelToCategory.proto */,
                                6C0C808320EAFD7A00334E33 /* TPPBPolicyIntroducersByCategory.proto */,
                                6C0C807D20EAF86100334E33 /* TPPBPolicyDocument.proto */,
                                6C0C807F20EAFB9600334E33 /* TPPBPolicyCategoriesByView.proto */,
                                6C0C808020EAFB9600334E33 /* TPPBPolicyModelToCategory.proto */,
                                6C0C808320EAFD7A00334E33 /* TPPBPolicyIntroducersByCategory.proto */,
-                               6C70D8D520EBDE4500AB6FAF /* TPPBPolicyRedaction.proto */,
                                1B8341B72239AD39002BF18A /* TPPBPolicyKeyViewMapping.proto */,
                                1B8341B72239AD39002BF18A /* TPPBPolicyKeyViewMapping.proto */,
-                               DC88466922373A4000738068 /* TPPBDictionaryMatchingRule.proto */,
+                               BEC373A620D810D800DBDF5B /* TPPBPolicyProhibits.proto */,
+                               6C70D8D520EBDE4500AB6FAF /* TPPBPolicyRedaction.proto */,
+                               BE7089D91FA3F0AF001ACC20 /* TPPBPolicySecret.proto */,
+                               BEC373A720D810D900DBDF5B /* TPPBUnknownMachineID.proto */,
+                               BE7089911F9AA027001ACC20 /* TPPBVoucher.proto */,
                        );
                        path = proto;
                        sourceTree = "<group>";
                        );
                        path = proto;
                        sourceTree = "<group>";
@@ -24130,6 +24299,8 @@
                DCE0777C21ADE96C002662FD /* generated */ = {
                        isa = PBXGroup;
                        children = (
                DCE0777C21ADE96C002662FD /* generated */ = {
                        isa = PBXGroup;
                        children = (
+                               6C6AF17D221A06F70091CE0A /* SecDbKeychainSerializedMetadataKey.h */,
+                               6C6AF17E221A06F80091CE0A /* SecDbKeychainSerializedMetadataKey.m */,
                                47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */,
                                47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */,
                                47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */,
                                47922D501FAA7DF60008F7E0 /* SecDbKeychainSerializedItemV7.h */,
                                47922D511FAA7DF70008F7E0 /* SecDbKeychainSerializedItemV7.m */,
                                47922D371FAA7C040008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h */,
@@ -24263,6 +24434,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 */,
@@ -24281,6 +24453,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 */,
@@ -25070,7 +25243,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 */,
-                               BE9B8B43202BB42C0081EF87 /* si-88-sectrust-valid-data */,
                                4C50ACFB1410671D00EE92DE /* DigiNotar */,
                                79679E241462028800CF997F /* DigicertMalaysia */,
                                E710C74B1331946500F85568 /* Supporting Files */,
                                4C50ACFB1410671D00EE92DE /* DigiNotar */,
                                79679E241462028800CF997F /* DigicertMalaysia */,
                                E710C74B1331946500F85568 /* Supporting Files */,
@@ -25202,6 +25374,13 @@
                E7FCBE401314471B000DE34E /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
                E7FCBE401314471B000DE34E /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               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 */,
                                DC89608C2395C75500D339D9 /* CoreServices.framework */,
                                BEC6A9142331992800080069 /* Network.framework */,
                                D47AB2CA2356AD72005A3801 /* Network.framework */,
@@ -25219,14 +25398,12 @@
                                0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */,
                                D4B68C5C211A7D98009FED69 /* libDER.a */,
                                EB490153211C0026001E6D6A /* UserManagement.framework */,
                                0C75AC642141F18D0073A2F9 /* KeychainCircle.framework */,
                                D4B68C5C211A7D98009FED69 /* libDER.a */,
                                EB490153211C0026001E6D6A /* UserManagement.framework */,
-                               472E184F20D9A20D00ECE7C9 /* libcoreauthd_client.a */,
                                475EDD0720D9A031009D2409 /* LocalAuthenticationPrivateUI.framework */,
                                475EDD0520D98CE2009D2409 /* LocalAuthentication.framework */,
                                475EDD0320D98CD0009D2409 /* libctkclient.a */,
                                475EDD0120D98C81009D2409 /* libaks_acl.a */,
                                475EDCFF20D98C64009D2409 /* IOKit.framework */,
                                475EDCFD20D98C53009D2409 /* libaks.a */,
                                475EDD0720D9A031009D2409 /* LocalAuthenticationPrivateUI.framework */,
                                475EDD0520D98CE2009D2409 /* LocalAuthentication.framework */,
                                475EDD0320D98CD0009D2409 /* libctkclient.a */,
                                475EDD0120D98C81009D2409 /* libaks_acl.a */,
                                475EDCFF20D98C64009D2409 /* IOKit.framework */,
                                475EDCFD20D98C53009D2409 /* libaks.a */,
-                               475EDCFB20D98C3C009D2409 /* libDER.a */,
                                475EDCF920D98C0D009D2409 /* CryptoTokenKit.framework */,
                                475EDCF720D98BF6009D2409 /* CoreCDP.framework */,
                                475EDCF520D98BCF009D2409 /* libACM.a */,
                                475EDCF920D98C0D009D2409 /* CryptoTokenKit.framework */,
                                475EDCF720D98BF6009D2409 /* CoreCDP.framework */,
                                475EDCF520D98BCF009D2409 /* libACM.a */,
@@ -25362,7 +25539,6 @@
                                EB2CA4D81D2C28C800AB770F /* libaks.a */,
                                4432AF8C1A01472C000958DC /* libaks_acl.a */,
                                DC1789181D77998C00B50D50 /* libbsm.dylib */,
                                EB2CA4D81D2C28C800AB770F /* libaks.a */,
                                4432AF8C1A01472C000958DC /* libaks_acl.a */,
                                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 */,
@@ -25427,14 +25603,12 @@
                                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 */,
                                DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */,
                                DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */,
                                EBF9AE171F536D0300FECBF7 /* Version.xcconfig */,
                                DC340C53208E7BAE004D7EEC /* swift_binary.xcconfig */,
                                DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */,
@@ -25550,6 +25724,8 @@
                EB80211C1D3D9044008540C4 /* Modules */ = {
                        isa = PBXGroup;
                        children = (
                EB80211C1D3D9044008540C4 /* Modules */ = {
                        isa = PBXGroup;
                        children = (
+                               0CF7613D23F24B5D00A3C3AD /* KeychainCircle.modulemap */,
+                               0CF7613F23F24B5E00A3C3AD /* OctagonTrust.modulemap */,
                                EB8021411D3D90BB008540C4 /* Security.iOS.modulemap */,
                                EB8021421D3D90BB008540C4 /* Security.macOS.modulemap */,
                                617570BA22C2D19E00EFBA37 /* Security.macOS.private.modulemap */,
                                EB8021411D3D90BB008540C4 /* Security.iOS.modulemap */,
                                EB8021421D3D90BB008540C4 /* Security.macOS.modulemap */,
                                617570BA22C2D19E00EFBA37 /* Security.macOS.private.modulemap */,
@@ -25568,6 +25744,9 @@
                EB9C1DAA1BDFD0FE00F89272 /* RegressionTests */ = {
                        isa = PBXGroup;
                        children = (
                EB9C1DAA1BDFD0FE00F89272 /* RegressionTests */ = {
                        isa = PBXGroup;
                        children = (
+                               3E88361224F0693200E9F4D6 /* secseccodeapitest */,
+                               6CF33CA2238714C900D1E75D /* bats_utd_plist.h */,
+                               6CF33CA4238714C900D1E75D /* PreprocessPlist.sh */,
                                EB9C1DAD1BDFD49400F89272 /* Security.plist */,
                                EBDAA7E320EC46CF003EA6E5 /* SecurityLocalKeychain.plist */,
                                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */,
                                EB9C1DAD1BDFD49400F89272 /* Security.plist */,
                                EBDAA7E320EC46CF003EA6E5 /* SecurityLocalKeychain.plist */,
                                EBE202752092913500B48020 /* SecurityInduceLowDisk.plist */,
@@ -25662,6 +25841,22 @@
 /* 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;
@@ -25707,6 +25902,7 @@
                                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */,
                                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */,
                                4718AEB8205B39C40068EC3F /* CKKSAccountStateTracker.h in Headers */,
                                4718AEB5205B39C40068EC3F /* CloudKitCategories.h in Headers */,
                                4718AEB6205B39C40068EC3F /* CKKSDeviceStateEntry.h in Headers */,
                                4718AEB8205B39C40068EC3F /* CKKSAccountStateTracker.h in Headers */,
+                               6C6AF183221A07240091CE0A /* SecDbKeychainSerializedMetadataKey.h in Headers */,
                                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */,
                                DC5A01E921BB428500D87AB9 /* CKKSTLKShare.h in Headers */,
                                4718AEBA205B39C40068EC3F /* CKKSTLKShareRecord.h in Headers */,
                                4718AEB9205B39C40068EC3F /* CKKSZoneStateEntry.h in Headers */,
                                DC5A01E921BB428500D87AB9 /* CKKSTLKShare.h in Headers */,
                                4718AEBA205B39C40068EC3F /* CKKSTLKShareRecord.h in Headers */,
@@ -25775,13 +25971,14 @@
                                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 */,
-                               5A061198229ED8F3006AF14A /* NSDate+SFAnalytics.h in Headers */,
                                D47079F321128C74005BCFDA /* SecCMS.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 */,
                                1BE85ED5235CEC250051E1D8 /* sslDeprecated.h in Headers */,
                                CDDE9BD11729ABFA0013B0E8 /* SecPasswordGenerate.h in Headers */,
                                4C7072860AC9EA4F007CC205 /* SecKey.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 */,
+                               0CD743BB23C3EF1D00FA0EC5 /* OTClique+Private.h in Headers */,
                                D4B3B1CC2115150D00A43409 /* SecCmsDigestedData.h in Headers */,
                                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */,
                                D47079FB211355C9005BCFDA /* CMSEncoder.h in Headers */,
                                D4B3B1CC2115150D00A43409 /* SecCmsDigestedData.h in Headers */,
                                476541651F339F6300413F65 /* SecdWatchdog.h in Headers */,
                                D47079FB211355C9005BCFDA /* CMSEncoder.h in Headers */,
@@ -25790,10 +25987,10 @@
                                DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */,
                                4791B4652118BBFF00977C3F /* OTControlProtocol.h in Headers */,
                                4C7073CA0ACB2BAD007CC205 /* SecRSAKey.h in Headers */,
                                DCD7EE981F4F4DE9007D9804 /* SecBase64.h in Headers */,
                                4791B4652118BBFF00977C3F /* OTControlProtocol.h in Headers */,
                                4C7073CA0ACB2BAD007CC205 /* SecRSAKey.h in Headers */,
+                               A6BC6491248B0AB400A21CD7 /* SecStaticCodePriv.h in Headers */,
                                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */,
                                4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */,
                                EBF252222155E910000204D6 /* OTJoiningConfiguration.h in Headers */,
                                EB6928C51D9C9C6E00062A18 /* SecRecoveryKey.h in Headers */,
                                4C0B906E0ACCBD240077CD03 /* SecFramework.h in Headers */,
                                EBF252222155E910000204D6 /* OTJoiningConfiguration.h in Headers */,
-                               EB9B283321C7755700173DC2 /* OTDefines.h in Headers */,
                                4C7391790B01745000C4CBFA /* vmdh.h in Headers */,
                                6CDB5FFB1FA78D2C00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                4C64E01C0B8FBC71009B306C /* SecIdentity.h in Headers */,
                                4C7391790B01745000C4CBFA /* vmdh.h in Headers */,
                                6CDB5FFB1FA78D2C00410924 /* SFAnalyticsMultiSampler.h in Headers */,
                                4C64E01C0B8FBC71009B306C /* SecIdentity.h in Headers */,
@@ -25871,6 +26068,7 @@
                                6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                D4707A262113EBC1005BCFDA /* SecCmsDecoder.h in Headers */,
                                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */,
                                6C8CE6C11FA248DA0032ADF0 /* SFAnalyticsActivityTracker+Internal.h in Headers */,
                                D4707A262113EBC1005BCFDA /* SecCmsDecoder.h in Headers */,
                                DC3C7ABA1D838C9F00F6A832 /* sslTypes.h in Headers */,
+                               6C06CB902408602900025303 /* SecItemInternal.h in Headers */,
                                6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */,
                                5A442FA6233C34FE00918373 /* SecExperimentInternal.h in Headers */,
                                4AF7000515AFB73800B9D400 /* SecOTRSession.h in Headers */,
                                6CE3654B1FA100D00012F6AB /* SFAnalytics.h in Headers */,
                                5A442FA6233C34FE00918373 /* SecExperimentInternal.h in Headers */,
                                4AF7000515AFB73800B9D400 /* SecOTRSession.h in Headers */,
@@ -25898,7 +26096,6 @@
                                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */,
                                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */,
                                DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */,
                                22A23B3D1E3AAC9800C41830 /* SecStaticCode.h in Headers */,
                                22A23B3E1E3AAC9800C41830 /* SecRequirement.h in Headers */,
                                DC9C95BE1F79DC5F000D19E5 /* CKKSControl.h in Headers */,
-                               0CBFEACC200FCD33009A60E9 /* SFSignInAnalytics.h in Headers */,
                                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */,
                                1B2BD397235E050E009A8624 /* Security-tapi.h in Headers */,
                                D43D8B2D20AB8A54005BEEC4 /* Security.apinotes in Headers */,
                                DC3C7AB61D838C2D00F6A832 /* SecAsn1Types.h in Headers */,
                                1B2BD397235E050E009A8624 /* Security-tapi.h in Headers */,
                                D43D8B2D20AB8A54005BEEC4 /* Security.apinotes in Headers */,
@@ -25937,6 +26134,7 @@
                                BEC373CB20D822DA00DBDF5B /* TPPBDispositionEntry.h in Headers */,
                                BEF88C7F1EB000BE00357577 /* TPModel.h in Headers */,
                                BE61F5AF1EB0060C00556CCF /* TrustedPeers.h in Headers */,
                                BEC373CB20D822DA00DBDF5B /* TPPBDispositionEntry.h in Headers */,
                                BEF88C7F1EB000BE00357577 /* TPModel.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 */,
@@ -26141,6 +26339,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 */,
@@ -26410,8 +26609,8 @@
                                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 */,
-                               EB4B6E261DC0683600AFC494 /* SecADWrapper.h in Headers */,
                                DC36895921235F2A003A3735 /* SecAKSWrappers.h in Headers */,
                                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */,
                                72CDF5131EC679A4002D233B /* sec_action.h in Headers */,
                                DC36895921235F2A003A3735 /* SecAKSWrappers.h in Headers */,
                                DC0BCDAA1D8C6A1F00070CB0 /* SecXPCError.h in Headers */,
                                72CDF5131EC679A4002D233B /* sec_action.h in Headers */,
@@ -26474,13 +26673,11 @@
                                DC2671071F3E8A0900816EED /* SecECKey.h in Headers */,
                                DC17877C1D77919500B50D50 /* SecBasePriv.h in Headers */,
                                5F00F95C230614AD00B832E0 /* SecImportExportPriv.h in Headers */,
                                DC2671071F3E8A0900816EED /* SecECKey.h in Headers */,
                                DC17877C1D77919500B50D50 /* SecBasePriv.h in Headers */,
                                5F00F95C230614AD00B832E0 /* SecImportExportPriv.h in Headers */,
-                               DC1787741D77915500B50D50 /* SecBreadcrumb.h in Headers */,
                                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */,
                                1BE85ED0235CEB620051E1D8 /* cms-tapi.h in Headers */,
                                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */,
                                DC0C343A21FA7DEB00417D04 /* SecEscrowRequest.h in Headers */,
                                DC17859F1D778C8D00B50D50 /* SecCertificate.h in Headers */,
                                6CB420AB2051FDE000FF2D44 /* LocalKeychainAnalytics.h in Headers */,
                                1BE85ED0235CEB620051E1D8 /* cms-tapi.h in Headers */,
                                DC1787761D77916600B50D50 /* SecCFAllocator.h in Headers */,
                                DC0C343A21FA7DEB00417D04 /* SecEscrowRequest.h in Headers */,
                                DC17859F1D778C8D00B50D50 /* SecCertificate.h in Headers */,
-                               DC1787361D77903700B50D50 /* SecCertificateBundle.h in Headers */,
                                DC1785501D778ACD00B50D50 /* SecCertificateOIDs.h in Headers */,
                                DC1787821D7791BE00B50D50 /* SecCertificatePriv.h in Headers */,
                                5A6D1B9E20810EF40057CAC8 /* SecProtocolTypes.h in Headers */,
                                DC1785501D778ACD00B50D50 /* SecCertificateOIDs.h in Headers */,
                                DC1787821D7791BE00B50D50 /* SecCertificatePriv.h in Headers */,
                                5A6D1B9E20810EF40057CAC8 /* SecProtocolTypes.h in Headers */,
@@ -26492,7 +26689,6 @@
                                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 */,
                                5A442FA8233C34FF00918373 /* SecExperimentInternal.h in Headers */,
                                DC1787771D77916A00B50D50 /* SecDH.h in Headers */,
                                DC1785311D778A0100B50D50 /* SecDecodeTransform.h in Headers */,
@@ -26517,7 +26713,6 @@
                                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 */,
-                               EB9B283421C7755800173DC2 /* OTDefines.h in Headers */,
                                6CC952481FB4CB2C0051A823 /* SFAnalytics+Internal.h in Headers */,
                                DC1787801D7791AD00B50D50 /* SecKeyPriv.h in Headers */,
                                DC1785521D778ACD00B50D50 /* SecKeychain.h in Headers */,
                                6CC952481FB4CB2C0051A823 /* SFAnalytics+Internal.h in Headers */,
                                DC1787801D7791AD00B50D50 /* SecKeyPriv.h in Headers */,
                                DC1785521D778ACD00B50D50 /* SecKeychain.h in Headers */,
@@ -26532,6 +26727,7 @@
                                DCA9D84221FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */,
                                DC1786F91D778F2500B50D50 /* SecNullTransform.h in Headers */,
                                DC17873D1D77903700B50D50 /* SecPassword.h in Headers */,
                                DCA9D84221FFE62A00B27421 /* EscrowRequestXPCProtocol.h in Headers */,
                                DC1786F91D778F2500B50D50 /* SecNullTransform.h in Headers */,
                                DC17873D1D77903700B50D50 /* SecPassword.h in Headers */,
+                               6C06CB912408602A00025303 /* SecItemInternal.h in Headers */,
                                DC1787791D77917700B50D50 /* SecPasswordGenerate.h in Headers */,
                                1BE85ED6235CEC250051E1D8 /* sslDeprecated.h in Headers */,
                                F6EEF77521675EF000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */,
                                DC1787791D77917700B50D50 /* SecPasswordGenerate.h in Headers */,
                                1BE85ED6235CEC250051E1D8 /* sslDeprecated.h in Headers */,
                                F6EEF77521675EF000FB7F79 /* AuthorizationTrampolinePriv.h in Headers */,
@@ -26549,6 +26745,7 @@
                                DC1785351D778A0100B50D50 /* SecReadTransform.h in Headers */,
                                DC17873F1D77903700B50D50 /* SecRecoveryPassword.h in Headers */,
                                6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */,
                                DC1785351D778A0100B50D50 /* SecReadTransform.h in Headers */,
                                DC17873F1D77903700B50D50 /* SecRecoveryPassword.h in Headers */,
                                6CE3654C1FA100D10012F6AB /* SFAnalytics.h in Headers */,
+                               D4593EFF24C131180069F577 /* SecTrustStore.h in Headers */,
                                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */,
                                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */,
                                DC17877A1D77917D00B50D50 /* SecServerEncryptionSupport.h in Headers */,
                                DC17858B1D778B8000B50D50 /* SecRequirement.h in Headers */,
                                DC1787551D7790A500B50D50 /* SecRequirementPriv.h in Headers */,
                                DC17877A1D77917D00B50D50 /* SecServerEncryptionSupport.h in Headers */,
@@ -26633,7 +26830,6 @@
                                D4B3B1D921151BBF00A43409 /* SecCmsSignedData.h in Headers */,
                                DC17857E1D778B4A00B50D50 /* oidscrl.h in Headers */,
                                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */,
                                D4B3B1D921151BBF00A43409 /* SecCmsSignedData.h in Headers */,
                                DC17857E1D778B4A00B50D50 /* oidscrl.h in Headers */,
                                DC1787701D77911D00B50D50 /* osKeyTemplates.h in Headers */,
-                               5A061199229ED8F4006AF14A /* NSDate+SFAnalytics.h in Headers */,
                                D4707A302114C316005BCFDA /* SecCmsDigestContext.h in Headers */,
                                DC2C5F511F0D935300FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                AA7C71B72185429900EB314F /* SecProtocolTypesPriv.h in Headers */,
                                D4707A302114C316005BCFDA /* SecCmsDigestContext.h in Headers */,
                                DC2C5F511F0D935300FEBDA7 /* CKKSControlProtocol.h in Headers */,
                                AA7C71B72185429900EB314F /* SecProtocolTypesPriv.h in Headers */,
@@ -26648,6 +26844,7 @@
                                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 */,
                                D4B3B1D0211516A100A43409 /* SecCmsEncryptedData.h in Headers */,
                                DC3C73561D837B9B00F6A832 /* SOSPeerInfoPriv.h in Headers */,
                                EB6928C61D9C9C6F00062A18 /* SecRecoveryKey.h in Headers */,
                                D4B3B1D0211516A100A43409 /* SecCmsEncryptedData.h in Headers */,
@@ -26679,6 +26876,7 @@
                                DC0FA6B02291F63F00FE01C4 /* OctagonPendingFlag.h in Headers */,
                                47922D421FAA7C240008F7E0 /* SecDbKeychainSerializedAKSWrappedKey.h in Headers */,
                                DCFE1C341F17ECE5007640C8 /* CKKSCondition.h in Headers */,
                                DC0FA6B02291F63F00FE01C4 /* OctagonPendingFlag.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 */,
                                DC1E5AB623063A4E00918162 /* CKKSPeerProvider.h in Headers */,
                                DC047081218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.h in Headers */,
                                DC1DA65E1E4554620094CE7F /* CKKSScanLocalItemsOperation.h in Headers */,
@@ -26710,6 +26908,7 @@
                                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 */,
                                DCC67E2D20DDC07900A70A31 /* OTPrepareOperation.h in Headers */,
                                DC378B2D1DEF9DF000A3DAFA /* CKKSMirrorEntry.h in Headers */,
                                DC94BCCA1F10448600E07CEB /* CloudKitCategories.h in Headers */,
                                DCC67E2D20DDC07900A70A31 /* OTPrepareOperation.h in Headers */,
@@ -26763,6 +26962,7 @@
                                DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.h in Headers */,
                                DCEA5D851E2F14810089CF55 /* OctagonAPSReceiver.h in Headers */,
                                DCBF2F851F913EF000ED0CA4 /* CKKSHealTLKSharesOperation.h in Headers */,
                                DCE278E81ED7A5B40083B485 /* CKKSUpdateCurrentItemPointerOperation.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 */,
@@ -26868,7 +27068,6 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               0C78827520132074002B7475 /* SFSignInAnalytics.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -27169,6 +27368,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 */,
@@ -27387,6 +27587,7 @@
                                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 */,
+                               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 */,
@@ -27411,6 +27612,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 */,
@@ -27988,42 +28190,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 */,
+                               0C7EB14F23F3D1480089097B /* PBXTargetDependency */,
+                               0C7EB14D23F3D13C0089097B /* PBXTargetDependency */,
+                               0CCC22AD23F38B0E00E1FCD0 /* PBXTargetDependency */,
+                               0CCC22AB23F38B0600E1FCD0 /* PBXTargetDependency */,
                        );
                        );
-                       name = SignInAnalyticsTests_osx;
-                       productName = CKKSTests;
-                       productReference = 0C9AEEB720783FBB00BF6237 /* SignInAnalyticsTests_osx.xctest */;
+                       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;
@@ -28102,6 +28305,22 @@
                        productReference = 3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
                        productReference = 3DD1FFD0201FDB1D0086D049 /* SecureTransport_ios_tests.xctest */;
                        productType = "com.apple.product-type.bundle.unit-test";
                };
+               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" */;
@@ -28179,9 +28398,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 */,
@@ -28190,18 +28409,19 @@
                        buildRules = (
                        );
                        dependencies = (
                        buildRules = (
                        );
                        dependencies = (
+                               6CE2AEAB22B2C1BE00C96AE7 /* PBXTargetDependency */,
+                               6CC638EB226695C300E5DB0B /* PBXTargetDependency */,
+                               6CC638ED226695C300E5DB0B /* PBXTargetDependency */,
                                D4BFFD692227B30700163B4B /* PBXTargetDependency */,
                                EB74CBD622077CC600F1BBAD /* PBXTargetDependency */,
                                D4BFFD692227B30700163B4B /* PBXTargetDependency */,
                                EB74CBD622077CC600F1BBAD /* PBXTargetDependency */,
-                               EBD7DF8121FF475B0089F2DF /* PBXTargetDependency */,
-                               EBD7DF8321FF475B0089F2DF /* 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 */ = {
@@ -28255,31 +28475,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 = (
-                               DC69A5872165298500512BD6 /* PBXTargetDependency */,
-                               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" */;
@@ -28550,24 +28745,43 @@
                        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 */,
                6C39234421F13E4D00D018AD /* SecDbBackupTests */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 6C39237621F13E4D00D018AD /* Build configuration list for PBXNativeTarget "SecDbBackupTests" */;
                        buildPhases = (
                                6C39234D21F13E4D00D018AD /* Sources */,
                                6C39235A21F13E4D00D018AD /* Frameworks */,
-                               6C7E8F1F21F7BE64008A2D56 /* Copy BATS Test Discovery Plist */,
-                               6C7E8F2121F7BE7F008A2D56 /* Chown BATS Test Discovery Plist */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        buildRules = (
                        );
                        dependencies = (
-                               6C8FF4B6224C1A9800E5C812 /* PBXTargetDependency */,
+                               6CC638E7226695B900E5DB0B /* PBXTargetDependency */,
+                               6CC638E9226695B900E5DB0B /* PBXTargetDependency */,
                                D4BFFD622227578900163B4B /* PBXTargetDependency */,
                                D4BFFD602227576E00163B4B /* PBXTargetDependency */,
                                D4BFFD5E2227575C00163B4B /* PBXTargetDependency */,
                                D4BFFD5C2227574C00163B4B /* PBXTargetDependency */,
                                D4BFFD592227574200163B4B /* PBXTargetDependency */,
                                D4BFFD622227578900163B4B /* PBXTargetDependency */,
                                D4BFFD602227576E00163B4B /* PBXTargetDependency */,
                                D4BFFD5E2227575C00163B4B /* PBXTargetDependency */,
                                D4BFFD5C2227574C00163B4B /* PBXTargetDependency */,
                                D4BFFD592227574200163B4B /* PBXTargetDependency */,
+                               6CE2AEAD22B2C1C300C96AE7 /* PBXTargetDependency */,
                        );
                        name = SecDbBackupTests;
                        productName = secdxctests;
                        );
                        name = SecDbBackupTests;
                        productName = secdxctests;
@@ -28592,55 +28806,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 = (
-                               DCD6BF5421E919610015F7A8 /* PBXTargetDependency */,
-                               DC93C4C9214713DC008F8362 /* PBXTargetDependency */,
-                               6C98082F1E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808311E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808351E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808371E788AEB00E70590 /* PBXTargetDependency */,
-                               6C9808391E788AEB00E70590 /* 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 = (
-                               DCD6BF5621E9196E0015F7A8 /* PBXTargetDependency */,
-                               DC93C4CD21471401008F8362 /* PBXTargetDependency */,
-                               6C9808A41E788CB100E70590 /* PBXTargetDependency */,
-                               6C98086B1E788AFD00E70590 /* PBXTargetDependency */,
-                               6C98086D1E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808711E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808731E788AFD00E70590 /* PBXTargetDependency */,
-                               6C9808751E788AFD00E70590 /* 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;
@@ -28667,6 +28869,7 @@
                                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 = (
                        );
                        );
                        buildRules = (
                        );
@@ -28694,9 +28897,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 */,
@@ -28706,28 +28909,11 @@
                        );
                        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" */;
                790851B50CA9859F0083CC4D /* securityd_ios */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 790851C90CA985C10083CC4D /* Build configuration list for PBXNativeTarget "securityd_ios" */;
@@ -28836,6 +29022,7 @@
                                BEAA0029202A832500E51F45 /* Resources */,
                                BEAA0028202A832500E51F45 /* Frameworks */,
                                EB3FB9A3231C125400DF52EA /* Copy Logging Files */,
                                BEAA0029202A832500E51F45 /* Resources */,
                                BEAA0028202A832500E51F45 /* Frameworks */,
                                EB3FB9A3231C125400DF52EA /* Copy Logging Files */,
+                               DC2C884D245B4B3E0040CBEB /* Copy Sandbox Profile (macOS only) */,
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );
@@ -29058,6 +29245,7 @@
                                D4707A0221136E69005BCFDA /* Frameworks */,
                                D4707A0321136E69005BCFDA /* Resources */,
                                D4428B432122718400EB8448 /* Generate BATS Plist */,
                                D4707A0221136E69005BCFDA /* Frameworks */,
                                D4707A0321136E69005BCFDA /* Resources */,
                                D4428B432122718400EB8448 /* Generate BATS Plist */,
+                               D428337D24E1D0B10068B2F5 /* Remove Name Constraints Resources from watchOS */,
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );
@@ -30551,6 +30739,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 = (
                        );
@@ -31256,9 +31445,12 @@
                4C35DB69094F906D002917C4 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
                4C35DB69094F906D002917C4 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastSwiftUpdateCheck = 1000;
-                               LastUpgradeCheck = 1120;
+                               LastSwiftUpdateCheck = 1200;
+                               LastUpgradeCheck = 1200;
                                TargetAttributes = {
                                TargetAttributes = {
+                                       0CD743A523C3EC8000FA0EC5 = {
+                                               CreatedOnToolsVersion = 12.0;
+                                       };
                                        4381690B1B4EDCBD00C54D58 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        4381690B1B4EDCBD00C54D58 = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
@@ -31282,9 +31474,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;
@@ -31298,14 +31487,14 @@
                                        5EBE24791B00CCAE0007DB0E = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
                                        5EBE24791B00CCAE0007DB0E = {
                                                CreatedOnToolsVersion = 7.0;
                                        };
-                                       6C39234421F13E4D00D018AD = {
-                                               ProvisioningStyle = Manual;
+                                       6C2045E92424BA7E00F9461D = {
+                                               CreatedOnToolsVersion = 12.0;
                                        };
                                        };
-                                       6C98082C1E788AEB00E70590 = {
-                                               TestTargetID = 6CF4A0B31E45488B00ECD7B5;
+                                       6C39234421F13E4D00D018AD = {
+                                               ProvisioningStyle = Automatic;
                                        };
                                        };
-                                       6C9808681E788AFD00E70590 = {
-                                               TestTargetID = 6CF4A0DF1E4549F200ECD7B5;
+                                       6C963280242A279B00C53CE2 = {
+                                               CreatedOnToolsVersion = 12.0;
                                        };
                                        6C9AA79D1F7C1D8F00D08296 = {
                                                CreatedOnToolsVersion = 9.0;
                                        };
                                        6C9AA79D1F7C1D8F00D08296 = {
                                                CreatedOnToolsVersion = 9.0;
@@ -31323,10 +31512,6 @@
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
-                                       6CF4A0DF1E4549F200ECD7B5 = {
-                                               CreatedOnToolsVersion = 8.3;
-                                               ProvisioningStyle = Automatic;
-                                       };
                                        BEAA002A202A832500E51F45 = {
                                                CreatedOnToolsVersion = 9.3;
                                                LastSwiftMigration = 0930;
                                        BEAA002A202A832500E51F45 = {
                                                CreatedOnToolsVersion = 9.3;
                                                LastSwiftMigration = 0930;
@@ -31561,6 +31746,7 @@
                                        };
                                        DCF216D621ADD5B10029CCC1 = {
                                                CreatedOnToolsVersion = 11.0;
                                        };
                                        DCF216D621ADD5B10029CCC1 = {
                                                CreatedOnToolsVersion = 11.0;
+                                               LastSwiftMigration = 1200;
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCF7889C1D88CB5200E694BB = {
                                                ProvisioningStyle = Automatic;
                                        };
                                        DCF7889C1D88CB5200E694BB = {
@@ -31644,15 +31830,14 @@
                        };
                        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 */;
                        );
                        mainGroup = 4C35DB67094F906D002917C4;
                        productRefGroup = 4C35DC36094F9120002917C4 /* Products */;
@@ -31704,6 +31889,7 @@
                                DC1789031D77980500B50D50 /* Security_osx */,
                                E7D847C41C6BE9710025BB44 /* KeychainCircle */,
                                BEF88C271EAFFC3F00357577 /* TrustedPeers */,
                                DC1789031D77980500B50D50 /* Security_osx */,
                                E7D847C41C6BE9710025BB44 /* KeychainCircle */,
                                BEF88C271EAFFC3F00357577 /* TrustedPeers */,
+                               0CD743A523C3EC8000FA0EC5 /* OctagonTrust */,
                                DC8E04911D7F6CED006D80EB /* ======= Daemons ========= */,
                                DCE4E8931D7F34F600AFB96E /* authd */,
                                DCE4E7F51D7A4DA800AFB96E /* secd */,
                                DC8E04911D7F6CED006D80EB /* ======= Daemons ========= */,
                                DCE4E8931D7F34F600AFB96E /* authd */,
                                DCE4E7F51D7A4DA800AFB96E /* secd */,
@@ -31720,6 +31906,7 @@
                                DC0BC5631D8B6E3D00070CB0 /* XPCTimeStampingService */,
                                BEAA002A202A832500E51F45 /* TrustedPeersHelper */,
                                DA41FE0D2241ADC000838FB3 /* otpaird */,
                                DC0BC5631D8B6E3D00070CB0 /* XPCTimeStampingService */,
                                BEAA002A202A832500E51F45 /* TrustedPeersHelper */,
                                DA41FE0D2241ADC000838FB3 /* otpaird */,
+                               6C2045E92424BA7E00F9461D /* KeychainStasher */,
                                DC8E04B11D7F6EC9006D80EB /* ======= Libraries ========= */,
                                DCDA5E4F2124B9C5009B11B2 /* aks_support */,
                                DC36895D21235F42003A3735 /* aks_mock */,
                                DC8E04B11D7F6EC9006D80EB /* ======= Libraries ========= */,
                                DCDA5E4F2124B9C5009B11B2 /* aks_support */,
                                DC36895D21235F42003A3735 /* aks_mock */,
@@ -31784,6 +31971,7 @@
                                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 */,
                                4CB740A20A47567C00D641BB /* securitytool_ios */,
                                DC5ABDC41D832DAB00CF422C /* securitytool_macos */,
                                DCE4E68A1D7A37FA00AFB96E /* security2tool_macos */,
@@ -31809,9 +31997,8 @@
                                DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */,
                                DC3502B41E0208BE00BC0587 /* CKKSTests */,
                                0C85DFD11FB38BB6000343A7 /* OTTests */,
                                DCE4E7311D7A43B500AFB96E /* SecurityTestsOSX */,
                                DC3502B41E0208BE00BC0587 /* CKKSTests */,
                                0C85DFD11FB38BB6000343A7 /* OTTests */,
+                               0CCC220023F357EE00E1FCD0 /* OctagonTrustTests */,
                                DC99B85B20EACA470065B73B /* OctagonTests */,
                                DC99B85B20EACA470065B73B /* OctagonTests */,
-                               0CF406042072E3E3003D6A7F /* SignInAnalyticsTests_ios */,
-                               0C9AEEAB20783FBB00BF6237 /* SignInAnalyticsTests_osx */,
                                DC610AAD1D7910C3002223DE /* gk_reset_check_macos */,
                                DC610A551D78F9D2002223DE /* codesign_tests_macos */,
                                DC610A461D78F48F002223DE /* SecTaskTest_macos */,
                                DC610AAD1D7910C3002223DE /* gk_reset_check_macos */,
                                DC610A551D78F9D2002223DE /* codesign_tests_macos */,
                                DC610A461D78F48F002223DE /* SecTaskTest_macos */,
@@ -31827,6 +32014,7 @@
                                EB433A201CC3243600A7EACE /* secitemstresstest */,
                                EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */,
                                DAE40BC520CF3E46002D5674 /* secitemcanarytest */,
                                EB433A201CC3243600A7EACE /* secitemstresstest */,
                                EBA9AA7D1CE30E58004E2B68 /* secitemnotifications */,
                                DAE40BC520CF3E46002D5674 /* secitemcanarytest */,
+                               3E88360824F068EF00E9F4D6 /* secseccodeapitest */,
                                DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */,
                                470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
                                DCE4E7CB1D7A4AED00AFB96E /* sectests_macos */,
                                470415CE1E5E14B5001F3D95 /* seckeychainnetworkextensionstest */,
                                47702B1D1E5F409700B29577 /* seckeychainnetworkextensionsystemdaemontest */,
@@ -31839,15 +32027,11 @@
                                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 */,
-                               4727FBB61F9918580003AE36 /* secdxctests_ios */,
-                               478D426C1FD72A8100CAB645 /* secdxctests_mac */,
+                               4727FBB61F9918580003AE36 /* secdxctests */,
                                EB49B2AD202D877F003F34A0 /* secdmockaks */,
                                6C39234421F13E4D00D018AD /* SecDbBackupTests */,
                                3DD1FEF5201C07F30086D049 /* SecureTransportTests_macos */,
                                EB49B2AD202D877F003F34A0 /* secdmockaks */,
                                6C39234421F13E4D00D018AD /* SecDbBackupTests */,
                                3DD1FEF5201C07F30086D049 /* SecureTransportTests_macos */,
@@ -31859,6 +32043,7 @@
                                D458C4E0214E1DE00043D982 /* TrustTestsRunner_ios */,
                                D4707A0421136E69005BCFDA /* TrustTests_ios */,
                                D453A4A42122236D00850A26 /* TrustTests_macos */,
                                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 */,
@@ -31938,6 +32123,13 @@
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
+               0CCC227423F357EE00E1FCD0 /* Resources */ = {
+                       isa = PBXResourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                4381690A1B4EDCBD00C54D58 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                4381690A1B4EDCBD00C54D58 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
@@ -31973,6 +32165,7 @@
                                4C198F220ACDB4BF00AAB142 /* Certificate.strings in Resources */,
                                4C198F230ACDB4BF00AAB142 /* OID.strings in Resources */,
                                D479F6E21F980FAB00388D28 /* Trust.strings 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;
                };
@@ -31982,7 +32175,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 */,
-                               BE9B8B4B202BB4D10081EF87 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -32002,20 +32194,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               6C98085D1E788AEB00E70590 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               6C9808991E788AFD00E70590 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                6CF4A0B21E45488B00ECD7B5 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                6CF4A0B21E45488B00ECD7B5 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
@@ -32023,18 +32201,10 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               6CF4A0DE1E4549F200ECD7B5 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                BE197F2419116FD100BA91D1 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                BE197F2419116FD100BA91D1 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               BE197F61191173F200BA91D1 /* entitlements.plist in Resources */,
                                BE197F2C19116FD100BA91D1 /* InfoPlist.strings in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                BE197F2C19116FD100BA91D1 /* InfoPlist.strings in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -32073,6 +32243,7 @@
                        files = (
                                D4B2966B22DBFDD300DCF250 /* TestCopyProperties_ios-data in Resources */,
                                D4D92DA9227890500009A7CF /* nist-certs in Resources */,
                        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 */,
                                D4056A2022712D750026E24E /* ssl-policy-certs in Resources */,
                                D4AC8BEF213212A7006E9871 /* si-18-certificate-parse in Resources */,
                                D458C51A214E2CC80043D982 /* si-20-sectrust-policies-data in Resources */,
@@ -32088,7 +32259,6 @@
                        files = (
                                D458C51F214E2E0C0043D982 /* Main.storyboard in Resources */,
                                D458C51C214E2DEB0043D982 /* Assets.xcassets in Resources */,
                        files = (
                                D458C51F214E2E0C0043D982 /* Main.storyboard in Resources */,
                                D458C51C214E2DEB0043D982 /* Assets.xcassets in Resources */,
-                               D458C51D214E2DEB0043D982 /* Base.lproj in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -32098,6 +32268,7 @@
                        files = (
                                D4B2966A22DBFDC700DCF250 /* TestCopyProperties_ios-data in Resources */,
                                D4D92DA8227890500009A7CF /* nist-certs in Resources */,
                        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 */,
                                D4056A1F22712D750026E24E /* ssl-policy-certs in Resources */,
                                D4AC8BEE21321291006E9871 /* si-18-certificate-parse in Resources */,
                                D458C517214E2C690043D982 /* si-20-sectrust-policies-data in Resources */,
@@ -32143,7 +32314,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 */,
@@ -32197,8 +32367,6 @@
                DC99B88E20EACA470065B73B /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                DC99B88E20EACA470065B73B /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
-                       files = (
-                       );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                DCE4E76B1D7A43B500AFB96E /* Resources */ = {
                        runOnlyForDeploymentPostprocessing = 0;
                };
                DCE4E76B1D7A43B500AFB96E /* Resources */ = {
@@ -32206,7 +32374,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */,
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E76D1D7A43B500AFB96E /* nist-certs in Resources */,
-                               BE9B8B4D202BB4F30081EF87 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -32252,7 +32419,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 */,
-                               BE9B8B4C202BB4E30081EF87 /* si-88-sectrust-valid-data in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -32297,7 +32463,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-               090585D020AEF9D300BB7490 /* Install OCMock framework */ = {
+               090585D120AEF9FE00BB7490 /* Install OCMock framework */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 8;
                        files = (
@@ -32311,21 +32477,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\n";
+                       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 = (
@@ -32336,9 +32501,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\n";
+                       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 = (
@@ -32349,69 +32514,76 @@
                        );
                        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\n";
+                       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";
                };
                };
-               6C7E8F2121F7BE7F008A2D56 /* Chown BATS Test Discovery Plist */ = {
+               8E64DB4E1C18A5B80076C9DF /* Install launchd 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 = "Chown BATS Test Discovery Plist";
-                       outputFileListPaths = (
-                       );
+                       name = "Install launchd plist";
                        outputPaths = (
                        outputPaths = (
+                               "$(INSTALL_ROOT)/$(INSTALL_DAEMON_AGENT_DIR)/com.apple.security.cloudkeychainproxy3.plist",
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
                        );
                        runOnlyForDeploymentPostprocessing = 1;
                        shellPath = /bin/sh;
-                       shellScript = "[ \"$(whoami)\" == \"root\" ] || exit 0\n chown -f root:wheel ${DSTROOT}/AppleInternal/CoreOS/BATS/unit_tests/*.plist\n";
+                       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\"\n";
+                       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";
                };
                };
-               8E64DB4E1C18A5B80076C9DF /* Install launchd plist */ = {
+               D42D044424734050004E7AA2 /* Install sandbox profile for macOS */ = {
                        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",
+                               "$(SRCROOT)/supd/com.apple.securityuploadd.sb",
+                       );
+                       name = "Install sandbox profile for macOS";
+                       outputFileListPaths = (
                        );
                        );
-                       name = "Install launchd plist";
                        outputPaths = (
                        outputPaths = (
-                               "$(INSTALL_ROOT)/$(INSTALL_DAEMON_AGENT_DIR)/com.apple.security.cloudkeychainproxy3.plist",
+                               "$(DSTROOT)/System/Library/Sandbox/Profiles/com.apple.securityuploadd.sb",
                        );
                        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 = "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";
                };
                D4428B432122718400EB8448 /* Generate BATS Plist */ = {
                        isa = PBXShellScriptBuildPhase;
                };
                D4428B432122718400EB8448 /* Generate BATS Plist */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -32471,6 +32643,28 @@
                        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";
                };
                        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 = (
+                       );
+                       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\n";
+               };
                D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
                D4C263C41F8FEAA8001317EA /* Run Script Generate Error Strings */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
@@ -32598,6 +32792,25 @@
                        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\n";
                };
                        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\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;
                        buildActionMask = 2147483647;
                DC58C4381D77BE5E003C25A4 /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
@@ -32988,10 +33201,10 @@
                                DCDB297E1FD8849D00B5D242 /* SFObjCType.m in Sources */,
                                5A061197229ED6EB006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                DCDB297C1FD8848A00B5D242 /* SFSQLite.m in Sources */,
                                DCDB297E1FD8849D00B5D242 /* SFObjCType.m in Sources */,
                                5A061197229ED6EB006AF14A /* NSDate+SFAnalytics.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 */,
                                0CA4EBF4202B8DBE002B1D96 /* CloudKitKeychainSyncingTestsBase.m in Sources */,
                                DCDB297D1FD8849A00B5D242 /* SFSQLiteStatement.m in Sources */,
                                DCDB297B1FD8847100B5D242 /* SecTask.c in Sources */,
-                               0CE751AF20ACC497002B2832 /* SFSignInAnalytics.m in Sources */,
                                0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */,
                                DCDB29791FD8844C00B5D242 /* client.c in Sources */,
                                DCDB297A1FD8845600B5D242 /* client_endpoint.m in Sources */,
                                0C1637291FD2066A00210823 /* SecdWatchdog.m in Sources */,
                                DCDB29791FD8844C00B5D242 /* client.c in Sources */,
                                DCDB297A1FD8845600B5D242 /* client_endpoint.m in Sources */,
@@ -33015,20 +33228,39 @@
                        );
                        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;
                };
@@ -33063,6 +33295,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 */,
@@ -33135,6 +33368,14 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        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;
@@ -33184,6 +33425,7 @@
                                4718AE44205B39C40068EC3F /* SFKeychainControlManager.m in Sources */,
                                DC3AF52F2229E770006577E8 /* CKKSListenerCollection.m in Sources */,
                                0C29BF2523232897003C807E /* OTDefines.m in Sources */,
                                4718AE44205B39C40068EC3F /* SFKeychainControlManager.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 */,
@@ -33195,6 +33437,7 @@
                                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */,
                                4718AE4E205B39C40068EC3F /* OTManager.m in Sources */,
                                4718AE50205B39C40068EC3F /* CKKSCurrentKeyPointer.m in Sources */,
                                4718AE4D205B39C40068EC3F /* CKKSLocalSynchronizeOperation.m in Sources */,
                                4718AE4E205B39C40068EC3F /* OTManager.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 */,
@@ -33247,6 +33490,7 @@
                                6C4AEF89218A09E80012C5DA /* CheckV12DevEnabled.m in Sources */,
                                4718AE81205B39C40068EC3F /* SecDbKeychainSerializedSecretData.m in Sources */,
                                4718AE82205B39C40068EC3F /* CKKSKeychainView.m in Sources */,
                                6C4AEF89218A09E80012C5DA /* CheckV12DevEnabled.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 */,
                                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */,
                                4718AE83205B39C40068EC3F /* SecuritydXPC.c in Sources */,
                                4718AE84205B39C40068EC3F /* SecDbKeychainSerializedItemV7.m in Sources */,
                                4718AE86205B39C40068EC3F /* CKKSProcessReceivedKeysOperation.m in Sources */,
@@ -33266,7 +33510,6 @@
                                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */,
                                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */,
                                EB0E1ACE2353A704002B6037 /* CKKSPBFileStorage.m in Sources */,
                                4718AE96205B39C40068EC3F /* CKKSZoneChangeFetcher.m in Sources */,
                                4718AE97205B39C40068EC3F /* CKKSCondition.m in Sources */,
                                EB0E1ACE2353A704002B6037 /* CKKSPBFileStorage.m in Sources */,
-                               4718AE98205B39C40068EC3F /* CKKSZone.m in Sources */,
                                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */,
                                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */,
                                DC5A01EB21BB428500D87AB9 /* CKKSTLKShare.m in Sources */,
                                4718AE99205B39C40068EC3F /* SFKeychainServer.m in Sources */,
                                4718AE9B205B39C40068EC3F /* swcagent_client.c in Sources */,
                                DC5A01EB21BB428500D87AB9 /* CKKSTLKShare.m in Sources */,
@@ -33284,12 +33527,15 @@
                                477A1FED2037A0E000ACD81D /* KeychainXCTest.m in Sources */,
                                4727FBEB1F99227F0003AE36 /* spi.c in Sources */,
                                4727FBEC1F99235B0003AE36 /* SecdWatchdog.m 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 */,
                                6C9791C921C2EAB60074C609 /* NSError+UsefulConstructors.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;
                };
@@ -33318,25 +33564,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               478D42751FD72A8100CAB645 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               478D42761FD72A8100CAB645 /* server_xpc.m in Sources */,
-                               4764E92D2059D8BF005497C9 /* KeychainModel.xcdatamodeld in Sources */,
-                               478D42771FD72A8100CAB645 /* server_security_helpers.m 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 */,
-                               6C9791CA21C2EAB70074C609 /* NSError+UsefulConstructors.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;
@@ -33360,10 +33587,8 @@
                        files = (
                                6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */,
                        files = (
                                6CAA8CFF1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                6CDB5FF61FA78D1B00410924 /* SFAnalyticsMultiSampler.m in Sources */,
-                               0CBFEACB200FCD2D009A60E9 /* SFSignInAnalytics.m in Sources */,
                                5A06118E229ED5EB006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                0C8884012154C4E80053224D /* OTJoiningConfiguration.m in Sources */,
                                5A06118E229ED5EB006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                0C8884012154C4E80053224D /* OTJoiningConfiguration.m in Sources */,
-                               0CBD55B31FE883F200A8CE21 /* SFBehavior.m in Sources */,
                                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */,
                                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */,
                                5A442FA9233C351000918373 /* SecExperiment.m in Sources */,
                                6C814A4D2050B4B600CB391B /* LocalKeychainAnalytics.m in Sources */,
                                220179E91E3BF03200EFB6F3 /* dummy.cpp in Sources */,
                                5A442FA9233C351000918373 /* SecExperiment.m in Sources */,
@@ -33458,6 +33683,7 @@
                                DC3AA2862097E22A007CA68A /* codesign.c in Sources */,
                                DC8506AC2097EEBA00C712EC /* sos.m in Sources */,
                                E78A9ADA1D34959200006B5B /* NSFileHandle+Formatting.m in Sources */,
                                DC3AA2862097E22A007CA68A /* codesign.c in Sources */,
                                DC8506AC2097EEBA00C712EC /* sos.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 */,
                                DC3AA28A2097E23B007CA68A /* keychain_find.m in Sources */,
                                DC3AA2782097DF70007CA68A /* readline.c in Sources */,
                                DC3AA2812097E216007CA68A /* add_internet_password.c in Sources */,
@@ -33539,10 +33765,21 @@
                        );
                        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 = (
                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 */,
                                6C39237B21F13EB400D018AD /* SecDbBackupManager.m in Sources */,
                                6C39237C21F13EB400D018AD /* SecDbBackupBag.m in Sources */,
                                6C39237D21F13EB400D018AD /* SecDbBackupBagIdentity.m in Sources */,
@@ -33583,56 +33820,43 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        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 */,
-                               5A061192229ED6E5006AF14A /* NSDate+SFAnalytics.m in Sources */,
-                               DC2353301ECA658900D7C1BE /* server_security_helpers.m 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 */,
-                               5A061193229ED6E6006AF14A /* NSDate+SFAnalytics.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.m 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;
                };
@@ -33673,16 +33897,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        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;
                790851B30CA9859F0083CC4D /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
@@ -33741,6 +33955,7 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 */,
                                0CE15E2F222DF63600B7EAA5 /* SetValueTransformer.swift in Sources */,
                                0CE15E2C222DF63600B7EAA4 /* RecoveryKey.swift in Sources */,
                                0CE15E43222DF6A800B7EAA4 /* Recovery.m in Sources */,
@@ -33749,6 +33964,7 @@
                                DC391F8D21BF244000772585 /* CKKSSIV.m in Sources */,
                                0CE15E30222DF63600B7EAA4 /* RecoverKeySet.swift in Sources */,
                                0C3BB3582188E18C0018FC14 /* OTPrivateKey+SF.m 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 */,
                                BECFA43D20F9493000B11002 /* Policy.swift in Sources */,
                                0CB582D1218920090040C5F2 /* OTAuthenticatedCiphertext.m in Sources */,
                                0CF70BD9218BED1000EC3515 /* CuttlefishExtensionWorkaround.swift in Sources */,
@@ -33760,6 +33976,7 @@
                                DCAA209C23AAF93700DCB594 /* Container_RecoveryKey.swift in Sources */,
                                BE9F8D19206C4AD300B53D16 /* ContainerMap.swift in Sources */,
                                BE9F4F8C2072D881004A52C2 /* Cuttlefish.pb.swift 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 */,
                                DC391F9D21BF2F8100772585 /* CKKSConstants.m in Sources */,
                                BE9F8D10206C099800B53D16 /* Container.swift in Sources */,
                                0CB582D3218920090040C5F2 /* OTPrivateKey.m in Sources */,
@@ -33769,13 +33986,17 @@
                                DCAD8F8622C43EC1007C3872 /* Container_MachineIDs.swift in Sources */,
                                DCB0C295222F5EF60083AECB /* CuttlefishErrors.swift in Sources */,
                                0CB582D021891FF40040C5F2 /* OTBottle.m 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 */,
                                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 */,
                                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 */,
                                0CB582D2218920090040C5F2 /* OTBottleContents.m in Sources */,
                                DC391F8F21BF284D00772585 /* CKKSSerializedKey.m in Sources */,
                                BEC0A96420B362EC00DBD772 /* Utils.swift in Sources */,
@@ -33813,18 +34034,22 @@
                                0CA4B4722171410200B17169 /* EscrowKeys.swift in Sources */,
                                BE536030209BC1FD0027E25A /* spi.c in Sources */,
                                BEA8558120B5DC7D00D5AD11 /* FakeCuttlefish.swift 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 */,
                                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 */,
                                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 */,
                                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 */,
                                DC747993222720C8001E0E8C /* MockCloudKit.m in Sources */,
                                0CB5C677218B803C0044F730 /* OTAuthenticatedCiphertext+SF.m in Sources */,
                                BE727824209CBCA800F0DA77 /* Cuttlefish.pb.swift in Sources */,
@@ -33833,12 +34058,15 @@
                                BE536033209BC3B30027E25A /* server_entitlement_helpers.c in Sources */,
                                DCAA209B23AAF8FD00DCB594 /* Container_RecoveryKey.swift in Sources */,
                                BED987E020991B1100607A5F /* TrustedPeersHelper.xcdatamodeld 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 */,
                                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 */,
                                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 */,
                                BED987DE2099156B00607A5F /* Container.swift in Sources */,
                                DCB0C292222F5E1D0083AECB /* CuttlefishErrors.swift in Sources */,
                                BECFA44320FD0A4B00B11002 /* LocalKeychainAnalytics.m in Sources */,
@@ -33887,6 +34115,7 @@
                                DCE0776A21ADD71C002662FD /* TPPBPeerDynamicInfo.m in Sources */,
                                DCE0776C21ADD71C002662FD /* TPPBPolicySecret.m in Sources */,
                                DCE0776E21ADD71C002662FD /* TPPBPeerStableInfo.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 */,
                                DCE0777021ADD71C002662FD /* TPPBVoucher.m in Sources */,
                                DCE0777221ADD71C002662FD /* TPPBPolicyDocument.m in Sources */,
                                DCE0777421ADD71C002662FD /* TPPBPolicyCategoriesByView.m in Sources */,
@@ -34007,20 +34236,23 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D49A370723873BD30065719F /* TrustDaemonTestCase.m in Sources */,
-                               D49A370423873A580065719F /* RevocationTests.m in Sources */,
+                               D477CB83237F692400C02355 /* RevocationTests.m in Sources */,
                                D40881F5217573C900180E81 /* SecTrustStatusCodes.c in Sources */,
                                D4FD421D217D789C002B7EE2 /* NameConstraintsTests.m in Sources */,
                                D4FD4221217D7B2E002B7EE2 /* PathScoringTests.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 */,
                                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 */,
                                D40881EF2175731E00180E81 /* SecTrust.c in Sources */,
                                D458C523214E33380043D982 /* KeySizeTests.m in Sources */,
+                               D477CB8C237F8DBC00C02355 /* AllowlistBlocklistTests.m in Sources */,
                                D458C4BD214E19AF0043D982 /* SignatureAlgorithmTests.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 */,
                                D458C4B1214E198F0043D982 /* CTTests.m in Sources */,
                                D458C4B9214E19AF0043D982 /* PathParseTests.m in Sources */,
                                D458C516214E286D0043D982 /* PolicyTests.m in Sources */,
@@ -34035,10 +34267,13 @@
                                D453A4AD2122236D00850A26 /* TrustFrameworkTestCase.m in Sources */,
                                D49A370D23877ECC0065719F /* OCSPCacheTests.m in Sources */,
                                D4EA5CF922B225D100883439 /* LoggingServerTests.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 */,
                                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 */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -34064,8 +34299,10 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D477CB6A237CBA2C00C02355 /* TrustDaemonTestCase.m in Sources */,
                                D49A370C23877ECC0065719F /* OCSPCacheTests.m in Sources */,
                                D40881FA217573F800180E81 /* SecPolicy.c 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 */,
                                D40881FB217573F800180E81 /* SecPolicyLeafCallbacks.c in Sources */,
                                D40881F9217573EF00180E81 /* SecSignatureVerificationSupport.c in Sources */,
                                D40881F8217573E700180E81 /* SecCertificate.c in Sources */,
@@ -34079,19 +34316,23 @@
                                D4FD4220217D7B2E002B7EE2 /* PathScoringTests.m in Sources */,
                                D458C4BC214E19AF0043D982 /* SignatureAlgorithmTests.m in Sources */,
                                D4FD421C217D789C002B7EE2 /* NameConstraintsTests.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 */,
                                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 */,
                                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 */,
                                D458C4B0214E198F0043D982 /* CTTests.m in Sources */,
+                               D477CB8F237F975500C02355 /* ValidTests.m in Sources */,
                                D458C4B2214E198F0043D982 /* EvaluationBasicTests.m in Sources */,
                                D458C4B2214E198F0043D982 /* EvaluationBasicTests.m in Sources */,
-                               D49A370323873A580065719F /* RevocationTests.m in Sources */,
+                               D477CB82237F692400C02355 /* RevocationTests.m in Sources */,
                                D458C4BA214E19AF0043D982 /* iAPTests.m in Sources */,
                                D458C4B8214E19AF0043D982 /* PathParseTests.m in Sources */,
                                D458C525214E33440043D982 /* VerifyDateTests.m in Sources */,
                                D458C4BA214E19AF0043D982 /* iAPTests.m in Sources */,
                                D458C4B8214E19AF0043D982 /* PathParseTests.m in Sources */,
                                D458C525214E33440043D982 /* VerifyDateTests.m in Sources */,
-                               D49A370623873BD30065719F /* TrustDaemonTestCase.m in Sources */,
                                D458C515214E286C0043D982 /* PolicyTests.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 */,
                                D477CB7B237E4BD700C02355 /* ExceptionTests.m in Sources */,
                                D4EF32182156DDEB000A31A5 /* TrustSettingsInterfaceTests.m in Sources */,
                                D44282FF22D68564001746B3 /* TrustEvaluationTestHelpers.m in Sources */,
@@ -34296,6 +34537,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 */,
@@ -34523,7 +34765,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 */,
@@ -34592,6 +34833,7 @@
                                DC74799A222722BC001E0E8C /* CKKSKeychainBackedKey.m in Sources */,
                                DC747999222722B2001E0E8C /* CKKSConstants.m in Sources */,
                                DC7479982227229D001E0E8C /* CKKSTLKShare.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 */,
                                DC0EF8F2208697C600AB9E95 /* main.swift in Sources */,
                                EB7ECF9623467FB400CE2D3C /* Cuttlefish.pb.swift in Sources */,
                                DCD48BFE20BF3D83009A3224 /* tpctl-objc.m in Sources */,
@@ -34604,6 +34846,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                DC2B757621F2A270003C9356 /* SecEscrowRequest.m in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                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 */,
                                0C84D8381FCF43BF00B822E3 /* OTControlProtocol.m in Sources */,
                                DCC585FF20BF8A7E005C7269 /* SecFramework.c in Sources */,
                                DCA85B991E8D980B00BA7241 /* client_endpoint.m in Sources */,
@@ -34613,7 +34856,6 @@
                                6CDB5FF51FA78D1A00410924 /* SFAnalyticsMultiSampler.m in Sources */,
                                DCA85B941E8D97E400BA7241 /* client.c in Sources */,
                                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */,
                                6CDB5FF51FA78D1A00410924 /* SFAnalyticsMultiSampler.m in Sources */,
                                DCA85B941E8D97E400BA7241 /* client.c in Sources */,
                                DCDF0A4F1D81D76F007AF174 /* Security.exp-in in Sources */,
-                               0CBFEACA200FCD2D009A60E9 /* SFSignInAnalytics.m in Sources */,
                                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */,
                                5A061191229ED6DB006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                EB9B285821C77C8D00173DC2 /* OTDefines.m in Sources */,
                                DC1789A51D779E3B00B50D50 /* dummy.cpp in Sources */,
                                5A061191229ED6DB006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                EB9B285821C77C8D00173DC2 /* OTDefines.m in Sources */,
@@ -34625,6 +34867,7 @@
                                6CAA8CFE1F83E800007B6E03 /* SFSQLite.m in Sources */,
                                DC9C95C01F79DC89000D19E5 /* CKKSControl.m in Sources */,
                                5AF594001FA0EE5300A5C1EC /* SecProtocol.c 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 */,
                                5A442FAA233C351100918373 /* SecExperiment.m in Sources */,
                                0C8884042154C4EA0053224D /* OTJoiningConfiguration.m in Sources */,
                                0C0E60E020D033E400E654F2 /* OTControl.m in Sources */,
@@ -34635,9 +34878,7 @@
                                6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */,
                                5A7E037A22272E0E003DB3A0 /* SecProtocolHelper.m in Sources */,
                                6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */,
                                6CE3654D1FA100E50012F6AB /* SFAnalytics.m in Sources */,
                                5A7E037A22272E0E003DB3A0 /* SecProtocolHelper.m in Sources */,
                                6CAA8CFD1F83E7EB007B6E03 /* SFObjCType.m in Sources */,
-                               DC1789A21D779DF400B50D50 /* SecBreadcrumb.c in Sources */,
                                78ADC62C1FA0FACE001EB8B6 /* SecProtocolTypes.m in Sources */,
                                78ADC62C1FA0FACE001EB8B6 /* SecProtocolTypes.m in Sources */,
-                               0CE079F41FEA15B20040A3F1 /* SFBehavior.m in Sources */,
                                6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                0CD9E34623592EA7002995DE /* OctagonSignPosts.m in Sources */,
                        );
                                6CBF65411FA1481100A68667 /* SFAnalyticsActivityTracker.m in Sources */,
                                0CD9E34623592EA7002995DE /* OctagonSignPosts.m in Sources */,
                        );
@@ -34686,6 +34927,7 @@
                                DC9C98C722E264F30021E29F /* CKKSFetchTests.m in Sources */,
                                EB0E1ADA2357627F002B6037 /* CKKSPBFileStorageTests.m in Sources */,
                                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */,
                                DC9C98C722E264F30021E29F /* CKKSFetchTests.m in Sources */,
                                EB0E1ADA2357627F002B6037 /* CKKSPBFileStorageTests.m in Sources */,
                                DC9C75161E4BCE1800F1CA0D /* CKKSOperationTests.m in Sources */,
+                               DC86122C2408AC190092E93B /* CKKSTests+ItemSyncChoice.m in Sources */,
                                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */,
                                EBC1024422EBF93E0083D356 /* CKKSTests+LockStateTracker.m in Sources */,
                                DCB221561E8B08BF001598BC /* server_xpc.m in Sources */,
                                DC8D238D2064649400E163C8 /* CKKSAPSHandlingTests.m in Sources */,
                                EBC1024422EBF93E0083D356 /* CKKSTests+LockStateTracker.m in Sources */,
                                DCB221561E8B08BF001598BC /* server_xpc.m in Sources */,
@@ -34694,12 +34936,14 @@
                                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */,
                                DC752F1921C1B69C00216089 /* SFSQLite.m in Sources */,
                                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */,
                                DC4268FE1E820371002B7110 /* server_endpoint.m in Sources */,
                                DC752F1921C1B69C00216089 /* SFSQLite.m in Sources */,
                                DCFE1C3D1F17EFB5007640C8 /* CKKSConditionTests.m in Sources */,
+                               DCBA6F2924105399009A5187 /* CKKSTests+ForwardCompatibility.m in Sources */,
                                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */,
                                DC5B391720C08B38005B09F6 /* SecFramework.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 */,
                                DCCD33C91E3FE95900AA4AD1 /* spi.c in Sources */,
                                DC5B391720C08B38005B09F6 /* SecFramework.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 */,
+                               A6C737BB23F37AB00009C930 /* entitlements.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -34727,6 +34971,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                1BB1CAB7232C05BD001D0C71 /* CuttlefishXPCWrapper.m in Sources */,
                        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 */,
                                1BB1CAB8232C05BD001D0C71 /* CuttlefishXPCWrapper.h in Sources */,
                                DCE0778021ADEC4B002662FD /* CKKSSerializedKey.m in Sources */,
                                DCE0777F21ADEC07002662FD /* OTAccountMetadataClassC.m in Sources */,
@@ -34735,6 +34980,7 @@
                                0C00FC86217A980100C8BF00 /* OTLocalCuttlefishReset.m in Sources */,
                                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */,
                                6C4AEF88218A09E70012C5DA /* CheckV12DevEnabled.m in Sources */,
                                0C00FC86217A980100C8BF00 /* OTLocalCuttlefishReset.m in Sources */,
                                DCAE1DDD2073FDCC00B4F687 /* NSError+UsefulConstructors.m in Sources */,
                                6C4AEF88218A09E70012C5DA /* CheckV12DevEnabled.m in Sources */,
+                               DCC40B122383786D00402CB9 /* CKKSStates.m in Sources */,
                                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */,
                                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */,
                                DCD33D7C220B99CC000A390B /* EscrowRequestController.m in Sources */,
                                DC797E1A1DD3F9A400CC9E42 /* CKKSSQLDatabaseObject.m in Sources */,
                                6CC1859F1E24E8EB009657D8 /* CKKSRateLimiter.m in Sources */,
                                DCD33D7C220B99CC000A390B /* EscrowRequestController.m in Sources */,
@@ -34751,6 +34997,7 @@
                                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 */,
                                0CDD6F79226E83F6009094C2 /* OTTriggerEscrowUpdateOperation.m in Sources */,
                                DC0D16072363BAF4007F0951 /* OTDetermineCDPBitStatusOperation.m in Sources */,
                                DC6D2C921DD2835A00BE372D /* CKKSOutgoingQueueEntry.m in Sources */,
@@ -34770,10 +35017,12 @@
                                6C880FC821C3351400D38D66 /* SecDbBackupBag.m in Sources */,
                                0C87D3D9229326AA007853B5 /* OTEnsureOctagonKeyConsistency.m in Sources */,
                                6C588D801EAA20AB00D7E322 /* RateLimiter.m in Sources */,
                                6C880FC821C3351400D38D66 /* SecDbBackupBag.m in Sources */,
                                0C87D3D9229326AA007853B5 /* OTEnsureOctagonKeyConsistency.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 */,
                                DC8DF6DC212F8A7C007B3FE8 /* OTSOSAdapter.m in Sources */,
                                0C66046A2134983900BFBBB8 /* OTEstablishOperation.m in Sources */,
                                DC15F7681E67A6F6003B9A40 /* CKKSHealKeyHierarchyOperation.m in Sources */,
                                DCE278DF1ED789EF0083B485 /* CKKSCurrentItemPointer.m in Sources */,
+                               DC061A722462136F0026ADB3 /* CKKSOperationDependencies.m in Sources */,
                                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,
                                DCC67E2F20DDC07900A70A31 /* OTPrepareOperation.m in Sources */,
                                DCB41DFC216D5E5B00F219E0 /* OTAccountMetadataClassC+KeychainSupport.m in Sources */,
                                DC3D748E1FD2217900AC57DA /* CKKSLocalSynchronizeOperation.m in Sources */,
                                DCC67E2F20DDC07900A70A31 /* OTPrepareOperation.m in Sources */,
                                DCB41DFC216D5E5B00F219E0 /* OTAccountMetadataClassC+KeychainSupport.m in Sources */,
@@ -34799,14 +35048,17 @@
                                DC762AA01E57A86A00B03A2C /* CKKSRecordHolder.m in Sources */,
                                DC52E7DF1D80BD8700B0A59C /* SOSChangeTracker.c in Sources */,
                                DCD33D94220CFF8A000A390B /* EscrowRequestPerformEscrowEnrollOperation.m 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 */,
                                0CC8A9032123AF06005D7F6A /* OTJoinWithVoucherOperation.m in Sources */,
                                DC1DA6681E4555D80094CE7F /* CKKSScanLocalItemsOperation.m in Sources */,
                                0CC8A9032123AF06005D7F6A /* OTJoinWithVoucherOperation.m in Sources */,
+                               DC061A71246213660026ADB3 /* CKKSLocalResetOperation.m in Sources */,
                                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */,
                                DC45D43E22EB619D00CEB6B7 /* OctagonStateMachineObservers.m in Sources */,
                                DC2C5F601F0EB97E00FEBDA7 /* CKKSNotifier.m in Sources */,
                                DC7250382296056000493D88 /* OTResetCKKSZonesLackingTLKsOperation.m in Sources */,
                                DC221BAC2267E2A70068DBCF /* OTUpdateTPHOperation.m in Sources */,
                                DC93F02A22387A010072720A /* OTSOSUpdatePreapprovalsOperation.m in Sources */,
                                DC18F7711E43E116006B8B43 /* CKKSFetchAllRecordZoneChangesOperation.m in Sources */,
                                DC45D43E22EB619D00CEB6B7 /* OctagonStateMachineObservers.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 */,
                                6C4AEF90218A0C170012C5DA /* SecDbBackupManager.m in Sources */,
                                DC5060ED20E2D88300925005 /* OTCuttlefishContext.m in Sources */,
                                DC0FA6B12291F63F00FE01C4 /* OctagonPendingFlag.m in Sources */,
@@ -34831,6 +35083,7 @@
                                DC52E7CB1D80BCD800B0A59C /* SecItemBackupServer.c in Sources */,
                                0C2F337220DD64930031A92D /* OTRamping.m in Sources */,
                                DCF12674218A757A000124C6 /* OTLeaveCliqueOperation.m 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 */,
                                0C8FD52521483EF20098E3FB /* OT.m in Sources */,
                                DC9C066B2149DFE400C6F7B8 /* OTAuthKitAdapter.m in Sources */,
                                DC52E7CD1D80BCE700B0A59C /* SecItemDataSource.c in Sources */,
                                0C8FD52521483EF20098E3FB /* OT.m in Sources */,
                                DC9C066B2149DFE400C6F7B8 /* OTAuthKitAdapter.m in Sources */,
@@ -34866,6 +35119,7 @@
                                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */,
                                EB80DE162195EDA4005B10FA /* SecC2DeviceInfo.m in Sources */,
                                47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,
                                DCB837321ED5045000015C07 /* CKKSLockStateTracker.m in Sources */,
                                EB80DE162195EDA4005B10FA /* SecC2DeviceInfo.m in Sources */,
                                47922D4C1FAA7C4A0008F7E0 /* SecDbKeychainSerializedSecretData.m in Sources */,
+                               6C6AF180221A070A0091CE0A /* SecDbKeychainSerializedMetadataKey.m in Sources */,
                                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */,
                                0C4F4DE221153E9E007F7E20 /* OTEpochOperation.m in Sources */,
                                DCBDB3B71E57C82300B61300 /* CKKSKeychainView.m in Sources */,
                                DC52E7D61D80BD2800B0A59C /* SecuritydXPC.c in Sources */,
                                0C4F4DE221153E9E007F7E20 /* OTEpochOperation.m in Sources */,
@@ -34893,7 +35147,7 @@
                                6C4AEF96218A127F0012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */,
                                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */,
                                EB7E91172194847A00B1FA21 /* SecEventMetric.m in Sources */,
                                6C4AEF96218A127F0012C5DA /* SecDbKeychainMetadataKeyStore.m in Sources */,
                                DCFE1C361F17ECE5007640C8 /* CKKSCondition.m in Sources */,
                                EB7E91172194847A00B1FA21 /* SecEventMetric.m in Sources */,
-                               DCEA5D971E3015830089CF55 /* CKKSZone.m in Sources */,
+                               0C64C0802485B2EF00D84A5D /* OTPreloadOctagonKeysOperation.m in Sources */,
                                DCAB17D22200D26900E1DFCF /* SecEscrowPendingRecord.m in Sources */,
                                DC047082218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m in Sources */,
                                DC047088218BCEF20078BDAA /* OTOperationDependencies.m in Sources */,
                                DCAB17D22200D26900E1DFCF /* SecEscrowPendingRecord.m in Sources */,
                                DC047082218BB21E0078BDAA /* OTCuttlefishAccountStateHolder.m in Sources */,
                                DC047088218BCEF20078BDAA /* OTOperationDependencies.m in Sources */,
@@ -35111,7 +35365,6 @@
                                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 */,
                                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */,
                                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */,
                                DC52EDBF1D80D5C500B0A59C /* secd-30-keychain-upgrade.m in Sources */,
                                DC52EDC11D80D5C500B0A59C /* secd-31-keychain-unreadable.m in Sources */,
                                0CCDE7171EEB08220021A946 /* secd-156-timers.m in Sources */,
@@ -35139,7 +35392,6 @@
                                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 */,
-                               0C78826F20132069002B7475 /* SFSignInAnalytics.m in Sources */,
                                DC52EDD71D80D5C500B0A59C /* secd-62-account-backup.m in Sources */,
                                DC52EDD91D80D5C500B0A59C /* secd-63-account-resurrection.m in Sources */,
                                DC52EDDA1D80D5C500B0A59C /* secd-65-account-retirement-reset.m in Sources */,
                                DC52EDD71D80D5C500B0A59C /* secd-62-account-backup.m in Sources */,
                                DC52EDD91D80D5C500B0A59C /* secd-63-account-resurrection.m in Sources */,
                                DC52EDDA1D80D5C500B0A59C /* secd-65-account-retirement-reset.m in Sources */,
@@ -35155,6 +35407,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 */,
@@ -35174,7 +35427,6 @@
                        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 */,
@@ -35182,13 +35434,11 @@
                                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */,
                                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */,
                                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */,
                                DC0B62291D90974600D43BCB /* si-25-cms-skid.m in Sources */,
                                09CB49701F2F64E300C8E4DE /* si-44-seckey-fv.m in Sources */,
                                D48BD18D206C45F00075DDC9 /* si-89-cms-hash-agility.m in Sources */,
-                               BE6215BE1DB6E69100961E15 /* si-84-sectrust-allowlist.m 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 */,
                                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 */,
-                               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 */,
                                D48E4E241E42F0620011B4BA /* si-62-csr.m in Sources */,
                                DC52EE481D80D71900B0A59C /* si-24-sectrust-digicert-malaysia.c in Sources */,
                                DC52EE491D80D71900B0A59C /* si-24-sectrust-diginotar.c in Sources */,
@@ -35197,16 +35447,13 @@
                                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 */,
-                               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 */,
                                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 */,
-                               BE9B8B4A202BB4A20081EF87 /* si-88-sectrust-valid.m in Sources */,
                                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.m in Sources */,
                                DC52EE561D80D73800B0A59C /* si-44-seckey-ies.m in Sources */,
                                D48BD194206C47530075DDC9 /* si-35-cms-expiration-time.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 */,
                                478014541FBF577000C4043D /* si-44-seckey-proxy.m in Sources */,
                                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */,
                                D4096E021ED5F207000AC459 /* si-64-ossl-cms.c in Sources */,
                                478014541FBF577000C4043D /* si-44-seckey-proxy.m in Sources */,
                                DCD45357209A5BA10086CBFC /* si-cms-signing-identity-p12.c in Sources */,
@@ -35238,6 +35485,7 @@
                                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;
@@ -35301,6 +35549,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 */,
@@ -35318,7 +35567,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 */,
@@ -35447,21 +35695,27 @@
                        files = (
                                DCE405C523A04A7F00C4343B /* OctagonTests+CKKSConfiguration.swift in Sources */,
                                1B8D2D96226E1FA500C94238 /* SetValueTransformer.swift in Sources */,
                        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 */,
                                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 */,
                                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 */,
                                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 */,
                                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 */,
                                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 */,
                                DCDF03122284E34B008055BA /* OctagonTests+EscrowRecovery.swift in Sources */,
                                DCFF82712162834D00D54B02 /* OctagonTestsXPCConnections.swift in Sources */,
                                DC5BEACD2217509A001681F0 /* OctagonTests+CloudKitAccount.swift in Sources */,
@@ -35469,20 +35723,25 @@
                                DC07090422936DB2002711B9 /* OctagonTests+ErrorHandling.swift in Sources */,
                                DC99B86C20EACA470065B73B /* FakeCuttlefish.swift in Sources */,
                                0CBEF3432242CA0600015691 /* TestsObjcTranslation.m 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 */,
                                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 */,
                                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 */,
                                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 */,
                                0C5258BB21BB128000B32C96 /* FakeSOSControl.m in Sources */,
                                DC3A9B2723A9D8BD0073ED06 /* Container_BottledPeers.swift in Sources */,
                                DC99B87020EACA470065B73B /* server_endpoint.m in Sources */,
@@ -35510,13 +35769,16 @@
                                DC99B87320EACA470065B73B /* Decrypter.swift in Sources */,
                                DC99B87420EACA470065B73B /* server_entitlement_helpers.c in Sources */,
                                DC99B87520EACA470065B73B /* TrustedPeersHelper.xcdatamodeld 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 */,
                                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 */,
                                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 */,
                                0C61F1F62194FC79009566D4 /* OTPrivateKey+SF.m in Sources */,
                                DC391FA821C04DAE00772585 /* OctagonPeerKeys.swift in Sources */,
                                DC99B87820EACA470065B73B /* Container.swift in Sources */,
@@ -35636,6 +35898,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 */,
@@ -35662,7 +35925,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 */,
@@ -35680,7 +35942,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 */,
@@ -35780,6 +36041,7 @@
                                DCAB17CE21FFF75B00E1DFCF /* MockSynchronousEscrowServer.m in Sources */,
                                DCBF4ABB21FFC82100539F0A /* SecFramework.c in Sources */,
                                DCBF4ABE21FFC82100539F0A /* server_entitlement_helpers.c 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;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -35795,6 +36057,7 @@
                                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 */,
@@ -35878,6 +36141,7 @@
                                DCD068201D8CDF7E007602F1 /* SecRequirement.cpp in Sources */,
                                DCD0681D1D8CDF7E007602F1 /* SecStaticCode.cpp in Sources */,
                                1F631C5622387FFE005920D8 /* legacydevid.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 */,
@@ -36091,6 +36355,7 @@
                                DC3AA2852097E22A007CA68A /* codesign.c in Sources */,
                                DC8506AD2097EEBC00C712EC /* sos.m in Sources */,
                                DCE4E6931D7A37FA00AFB96E /* NSFileHandle+Formatting.m 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 */,
                                DC3AA2892097E23A007CA68A /* keychain_find.m in Sources */,
                                DC3AA2792097DF71007CA68A /* readline.c in Sources */,
                                DC3AA2822097E218007CA68A /* add_internet_password.c in Sources */,
@@ -36111,7 +36376,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E7B51D7A43FF00AFB96E /* main.m in Sources */,
-                               DCE4E7B61D7A440A00AFB96E /* bc-10-knife-on-bread.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -36120,7 +36384,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                DCE4E7E21D7A4B7F00AFB96E /* main.c in Sources */,
-                               DCE4E7DF1D7A4B4C00AFB96E /* bc-10-knife-on-bread.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -36162,6 +36425,7 @@
                                DCE4E8C31D7F353900AFB96E /* session.c in Sources */,
                                DCE4E8BC1D7F353900AFB96E /* engine.c in Sources */,
                                DCE4E8C41D7F353900AFB96E /* connection.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 */,
                                DCE4E8C11D7F353900AFB96E /* rule.c in Sources */,
                                DCE4E8C01D7F353900AFB96E /* process.c in Sources */,
                                DCE4E8B31D7F353900AFB96E /* agent.c in Sources */,
@@ -36209,18 +36473,21 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        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 */,
                                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 */,
                                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 */,
                                DCF216DF21ADD5FB0029CCC1 /* OTPairingMessage.proto in Sources */,
                                DCF216E121ADD6060029CCC1 /* TPPBVoucher.proto in Sources */,
                                DCF216E021ADD5FD0029CCC1 /* OTAccountMetadataClassC.proto in Sources */,
                                DCE0774721ADD63A002662FD /* TPPBDispositionEntry.proto in Sources */,
-                               DCE0774821ADD63C002662FD /* TPPBAncientEpoch.proto in Sources */,
                                DCE0774621ADD638002662FD /* TPPBDisposition.proto in Sources */,
                                DCE0774921ADD63E002662FD /* TPPBPolicyProhibits.proto in Sources */,
                                DCE0774A21ADD640002662FD /* TPPBUnknownMachineID.proto in Sources */,
                                DCE0774621ADD638002662FD /* TPPBDisposition.proto in Sources */,
                                DCE0774921ADD63E002662FD /* TPPBPolicyProhibits.proto in Sources */,
                                DCE0774A21ADD640002662FD /* TPPBUnknownMachineID.proto in Sources */,
@@ -36232,6 +36499,7 @@
                                5A47FFB3228F5E5500F781B8 /* KCInitialMessageData.proto in Sources */,
                                DCE0775021ADD655002662FD /* TPPBPolicyModelToCategory.proto in Sources */,
                                DCE0775121ADD658002662FD /* TPPBPolicyIntroducersByCategory.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 */,
                                DCE0774F21ADD651002662FD /* TPPBPolicyCategoriesByView.proto in Sources */,
                                DC88466B22373A5E00738068 /* TPPBDictionaryMatchingRule.proto in Sources */,
                                DCE0775221ADD65A002662FD /* TPPBPolicyRedaction.proto in Sources */,
@@ -36520,6 +36788,7 @@
                        files = (
                                EB413B801E663AEB00592085 /* PairingChannel.m in Sources */,
                                0CB72D9E21E42FCF00D8BC9B /* OTPairingMessage.m in Sources */,
                        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 */,
                                0CB72DA121E42FCF00D8BC9B /* OTSponsorToApplicantRound2M2.m in Sources */,
                                E7F480151C73980D00390FDB /* KCJoiningRequestSecretSession.m in Sources */,
                                E7F480331C73FC4C00390FDB /* KCAESGCMDuplexSession.m in Sources */,
@@ -36532,6 +36801,7 @@
                                E7F482AC1C7558F700390FDB /* KCJoiningAcceptSession.m in Sources */,
                                E71454F01C741E0800B5B20B /* KCError.m in Sources */,
                                E772FD471CC15EFA00D63E41 /* NSData+SecRandom.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 */,
                                0CB72D9D21E42FCF00D8BC9B /* OTApplicantToSponsorRound2M1.m in Sources */,
                                E7F482AA1C7554FB00390FDB /* NSError+KCCreationHelpers.m in Sources */,
                                E75C0E831C6FC31D00E6953B /* KCSRPContext.m in Sources */,
@@ -36613,7 +36883,6 @@
                        files = (
                                6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */,
                                EB1E069D211E16260088F0B1 /* mockaksxcbase.m in Sources */,
                        files = (
                                6C32BB9920EAE6B00042DF59 /* LocalKeychainAnalytics.m in Sources */,
                                EB1E069D211E16260088F0B1 /* mockaksxcbase.m in Sources */,
-                               0CC3771320A222BC00B58D2D /* SFSignInAnalytics.m in Sources */,
                                EB49B2DB202DF20F003F34A0 /* spi.c in Sources */,
                                EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */,
                                EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */,
                                EB49B2DB202DF20F003F34A0 /* spi.c in Sources */,
                                EB49B2D7202DF1F7003F34A0 /* server_endpoint.m in Sources */,
                                EBC73F2020993F8600AE3350 /* SFAnalyticsSQLiteStore.m in Sources */,
@@ -36622,6 +36891,7 @@
                                EB49B2D9202DF1F7003F34A0 /* server_security_helpers.m in Sources */,
                                EBC73F2B2099785900AE3350 /* SFObjCType.m in Sources */,
                                480ADDB22155A0CE00318FC6 /* SOSAnalytics.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 */,
                                EB49B2E0202DF5D7003F34A0 /* server_entitlement_helpers.c in Sources */,
                                5A061196229ED6E8006AF14A /* NSDate+SFAnalytics.m in Sources */,
                                EBC73F2A20996AD400AE3350 /* SFSQLiteStatement.m in Sources */,
@@ -36664,6 +36934,7 @@
                                EB6952A4223B75C300F02C1C /* server_xpc.m in Sources */,
                                EB6952A5223B75C300F02C1C /* SecDbKeychainSerializedItemV7.m in Sources */,
                                EB6952A6223B75C300F02C1C /* SecDbQuery.c 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 */,
                                EB6952A7223B75C300F02C1C /* SecuritydXPC.c in Sources */,
                                EB6952A8223B75C300F02C1C /* server_endpoint.m in Sources */,
                                EB6952A9223B75C300F02C1C /* SecDbKeychainItemV7.m in Sources */,
@@ -36703,6 +36974,7 @@
                                EB89086C21F17D3C00F0DDDB /* server_security_helpers.m in Sources */,
                                EB8908B021F18D7B00F0DDDB /* SecDbKeychainSerializedMetadata.m in Sources */,
                                EB89086D21F17D3C00F0DDDB /* server_xpc.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 */,
                                EB8908B221F18E1400F0DDDB /* SecDbKeychainSerializedItemV7.m in Sources */,
                                EB8908A821F1886100F0DDDB /* SecDbQuery.c in Sources */,
                                EB8908AD21F18CEF00F0DDDB /* SecuritydXPC.c in Sources */,
@@ -36791,6 +37063,16 @@
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = 0C10C93B1DD548BD000602A8 /* PBXContainerItemProxy */;
                };
                        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 */;
                0C2BCBBC1D0640B200ED7A2F /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 0C2BCBA81D06401F00ED7A2F /* dtlsEchoClient */;
@@ -36801,15 +37083,15 @@
                        target = 0C2BCBBD1D0648D100ED7A2F /* dtlsEchoServer */;
                        targetProxy = 0C2BCBD01D0648FA00ED7A2F /* PBXContainerItemProxy */;
                };
                        target = 0C2BCBBD1D0648D100ED7A2F /* dtlsEchoServer */;
                        targetProxy = 0C2BCBD01D0648FA00ED7A2F /* PBXContainerItemProxy */;
                };
-               0C3E2EA92073F5C400F5B95B /* PBXTargetDependency */ = {
+               0C65BB4D23C3F31B0063D2B7 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 4C32C0AE0A4975F6002891BD /* Security_ios */;
-                       targetProxy = 0C3E2EA82073F5C400F5B95B /* PBXContainerItemProxy */;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C65BB4C23C3F31B0063D2B7 /* PBXContainerItemProxy */;
                };
                };
-               0C5663EE20BE2E1A0035F362 /* PBXTargetDependency */ = {
+               0C65BB4F23C3F3270063D2B7 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 0C5663ED20BE2E1A0035F362 /* PBXContainerItemProxy */;
+                       target = 0CD743A523C3EC8000FA0EC5 /* OctagonTrust */;
+                       targetProxy = 0C65BB4E23C3F3270063D2B7 /* PBXContainerItemProxy */;
                };
                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                };
                0C78CCE51FCC97E7008B4B24 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
@@ -36821,6 +37103,16 @@
                        target = 0C8BBEFD1FCB446400580909 /* otctl */;
                        targetProxy = 0C78CCE61FCC97F1008B4B24 /* PBXContainerItemProxy */;
                };
                        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 */;
                0C85DFD81FB38BB6000343A7 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
@@ -36846,11 +37138,6 @@
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = 0C85DFE11FB38BB6000343A7 /* PBXContainerItemProxy */;
                };
                        target = DCC78EA81D8088E200865A7C /* security */;
                        targetProxy = 0C85DFE11FB38BB6000343A7 /* PBXContainerItemProxy */;
                };
-               0C9AEEBA20783FE000BF6237 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC1789031D77980500B50D50 /* Security_osx */;
-                       targetProxy = 0C9AEEB920783FE000BF6237 /* PBXContainerItemProxy */;
-               };
                0CA378E923876E0900090B7E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 0CA378E123876DD100090B7E /* reset_account */;
                0CA378E923876E0900090B7E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 0CA378E123876DD100090B7E /* reset_account */;
@@ -36866,6 +37153,36 @@
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                        targetProxy = 0CC593F72299EDFC006C34B5 /* PBXContainerItemProxy */;
                };
                        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 */;
                0CF09210219649DB002B0AEE /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
@@ -36906,6 +37223,11 @@
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = 3DD258A1204B7DA800F5DA78 /* PBXContainerItemProxy */;
                };
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = 3DD258A1204B7DA800F5DA78 /* PBXContainerItemProxy */;
                };
+               3E88361D24F08F5400E9F4D6 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 3E88360824F068EF00E9F4D6 /* secseccodeapitest */;
+                       targetProxy = 3E88361C24F08F5400E9F4D6 /* PBXContainerItemProxy */;
+               };
                438169E71B4EE4B300C54D58 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
                438169E71B4EE4B300C54D58 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4381690B1B4EDCBD00C54D58 /* SOSCCAuthPlugin */;
@@ -36951,31 +37273,11 @@
                        target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
                        targetProxy = 4771D981209A76B100BA9772 /* PBXContainerItemProxy */;
                };
                        target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
                        targetProxy = 4771D981209A76B100BA9772 /* PBXContainerItemProxy */;
                };
-               478D426D1FD72A8100CAB645 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52EDA61D80D58400B0A59C /* secdRegressions */;
-                       targetProxy = 478D426E1FD72A8100CAB645 /* PBXContainerItemProxy */;
-               };
-               478D426F1FD72A8100CAB645 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC0BCBD91D8C648C00070CB0 /* regressionBase */;
-                       targetProxy = 478D42701FD72A8100CAB645 /* PBXContainerItemProxy */;
-               };
-               478D42731FD72A8100CAB645 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 478D42741FD72A8100CAB645 /* PBXContainerItemProxy */;
-               };
                47A6FC6A206B461700BD6C54 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                        targetProxy = 47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */;
                };
                47A6FC6A206B461700BD6C54 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                        targetProxy = 47A6FC69206B461700BD6C54 /* PBXContainerItemProxy */;
                };
-               47A6FC6C206B462400BD6C54 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = 47A6FC6B206B462400BD6C54 /* PBXContainerItemProxy */;
-               };
                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 47C2F1822059CB680062DE30 /* KeychainResources */;
                47C2F18C2059CBEA0062DE30 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 47C2F1822059CB680062DE30 /* KeychainResources */;
@@ -37001,11 +37303,6 @@
                        target = DC1789031D77980500B50D50 /* Security_osx */;
                        targetProxy = 47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */;
                };
                        target = DC1789031D77980500B50D50 /* Security_osx */;
                        targetProxy = 47C51B8A1EEA657D0032D9E5 /* PBXContainerItemProxy */;
                };
-               47D991D020407F7E0078CAE2 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = 47D991CF20407F7E0078CAE2 /* PBXContainerItemProxy */;
-               };
                47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
                47DE88CE1FA7AD6200DD3254 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCC78EA81D8088E200865A7C /* security */;
@@ -37041,81 +37338,81 @@
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
                        targetProxy = 5346481A17331ED800FE9172 /* PBXContainerItemProxy */;
                };
                        target = 5346480017331E1100FE9172 /* KeychainSyncAccountNotification */;
                        targetProxy = 5346481A17331ED800FE9172 /* PBXContainerItemProxy */;
                };
-               6C4AA1AA2228B640006FA945 /* PBXTargetDependency */ = {
+               5AAE383623D261CF0025CF9E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
-                       targetProxy = 6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */;
+                       target = 5A442F81233C330F00918373 /* experimentTool */;
+                       targetProxy = 5AAE383523D261CF0025CF9E /* PBXContainerItemProxy */;
                };
                };
-               6C8FF4B6224C1A9800E5C812 /* PBXTargetDependency */ = {
+               6C14CA0423C4F6830097B572 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = BEF88C271EAFFC3F00357577 /* TrustedPeers */;
-                       targetProxy = 6C8FF4B5224C1A9800E5C812 /* PBXContainerItemProxy */;
-               };
-               6C98082F1E788AEB00E70590 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
-                       targetProxy = 6C9808301E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = 4718AE2E205B39C40068EC3F /* libsecurityd_bridge */;
+                       targetProxy = 6C14CA0323C4F6830097B572 /* PBXContainerItemProxy */;
                };
                };
-               6C9808311E788AEB00E70590 /* PBXTargetDependency */ = {
+               6C16258123C4FFC40086A0FF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 6C9808321E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = D4ADA3181E2B41670031CEA3 /* libtrustd */;
+                       targetProxy = 6C16258023C4FFC40086A0FF /* PBXContainerItemProxy */;
                };
                };
-               6C9808351E788AEB00E70590 /* PBXTargetDependency */ = {
+               6C16258423C4FFD40086A0FF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
                        isa = PBXTargetDependency;
                        target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 6C9808361E788AEB00E70590 /* PBXContainerItemProxy */;
+                       targetProxy = 6C16258323C4FFD40086A0FF /* PBXContainerItemProxy */;
                };
                };
-               6C9808371E788AEB00E70590 /* PBXTargetDependency */ = {
+               6C16258623C4FFD40086A0FF /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
                        isa = PBXTargetDependency;
                        target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 6C9808381E788AEB00E70590 /* PBXContainerItemProxy */;
+                       targetProxy = 6C16258523C4FFD40086A0FF /* PBXContainerItemProxy */;
                };
                };
-               6C9808391E788AEB00E70590 /* PBXTargetDependency */ = {
+               6C2045F82424BC4400F9461D /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 6C98083A1E788AEB00E70590 /* PBXContainerItemProxy */;
+                       target = 6C2045E92424BA7E00F9461D /* KeychainStasher */;
+                       targetProxy = 6C2045F72424BC4400F9461D /* PBXContainerItemProxy */;
                };
                };
-               6C98086B1E788AFD00E70590 /* PBXTargetDependency */ = {
+               6C2D797322C06CEB00C3CE32 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DC8834011D8A218F00CE0ACA /* ASN1 */;
-                       targetProxy = 6C98086C1E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 6C39234421F13E4D00D018AD /* SecDbBackupTests */;
+                       targetProxy = 6C2D797222C06CEB00C3CE32 /* PBXContainerItemProxy */;
                };
                };
-               6C98086D1E788AFD00E70590 /* PBXTargetDependency */ = {
+               6C2D797522C06CEF00C3CE32 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = 6C98086E1E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6C2D797422C06CEF00C3CE32 /* PBXContainerItemProxy */;
                };
                };
-               6C9808711E788AFD00E70590 /* PBXTargetDependency */ = {
+               6C4AA1AA2228B640006FA945 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = 6C9808721E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
+                       targetProxy = 6C4AA1A92228B640006FA945 /* PBXContainerItemProxy */;
                };
                };
-               6C9808731E788AFD00E70590 /* PBXTargetDependency */ = {
+               6C61D3E8242A29BA008AB9BB /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = 6C9808741E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = 6C963280242A279B00C53CE2 /* stashtester */;
+                       targetProxy = 6C61D3E7242A29BA008AB9BB /* PBXContainerItemProxy */;
                };
                };
-               6C9808751E788AFD00E70590 /* PBXTargetDependency */ = {
+               6C7BE2AA23C3DD64003BB2CA /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = DCC78EA81D8088E200865A7C /* security */;
-                       targetProxy = 6C9808761E788AFD00E70590 /* PBXContainerItemProxy */;
+                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
+                       targetProxy = 6C7BE2AB23C3DD64003BB2CA /* PBXContainerItemProxy */;
                };
                };
-               6C9808A01E788B9400E70590 /* PBXTargetDependency */ = {
+               6C7BE2AC23C3DD64003BB2CA /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */;
-                       targetProxy = 6C98089F1E788B9400E70590 /* PBXContainerItemProxy */;
+                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
+                       targetProxy = 6C7BE2AD23C3DD64003BB2CA /* PBXContainerItemProxy */;
                };
                };
-               6C9808A41E788CB100E70590 /* PBXTargetDependency */ = {
+               6C7BE2EA23C3DD9C003BB2CA /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        isa = PBXTargetDependency;
-                       target = 6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */;
-                       targetProxy = 6C9808A31E788CB100E70590 /* PBXContainerItemProxy */;
+                       target = 6C7BE2A923C3DD64003BB2CA /* securitytool_bridge */;
+                       targetProxy = 6C7BE2E923C3DD9C003BB2CA /* PBXContainerItemProxy */;
                };
                6C9A49B21FAB647D00239D58 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                        targetProxy = 6C9A49B11FAB647D00239D58 /* 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 */;
                6CAA8D3D1F8431BC007B6E03 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
@@ -37126,6 +37423,56 @@
                        target = 6CAA8D1F1F842FB3007B6E03 /* securityuploadd */;
                        targetProxy = 6CAA8D3E1F8431C9007B6E03 /* PBXContainerItemProxy */;
                };
                        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 */;
+               };
+               6CC638FE2266AE0A00E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CC638FD2266AE0A00E5DB0B /* PBXContainerItemProxy */;
+               };
+               6CC639002266AE0A00E5DB0B /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6C39234421F13E4D00D018AD /* SecDbBackupTests */;
+                       targetProxy = 6CC638FF2266AE0A00E5DB0B /* PBXContainerItemProxy */;
+               };
+               6CE2AEAB22B2C1BE00C96AE7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */;
+                       targetProxy = 6CE2AEAA22B2C1BE00C96AE7 /* PBXContainerItemProxy */;
+               };
+               6CE2AEAD22B2C1C300C96AE7 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp */;
+                       targetProxy = 6CE2AEAC22B2C1C300C96AE7 /* PBXContainerItemProxy */;
+               };
+               6CF33CA62387156600D1E75D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CF33CA52387156600D1E75D /* PBXContainerItemProxy */;
+               };
+               6CF33CA82387157200D1E75D /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4727FBB61F9918580003AE36 /* secdxctests */;
+                       targetProxy = 6CF33CA72387157200D1E75D /* PBXContainerItemProxy */;
+               };
                873C14B221540FED003C9C00 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
                873C14B221540FED003C9C00 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC0BCC211D8C684F00070CB0 /* utilities */;
@@ -37406,11 +37753,6 @@
                        target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
                        targetProxy = D45D8F812224DBE300D6C124 /* PBXContainerItemProxy */;
                };
                        target = 6CCDF7831E3C25FA003F2555 /* KeychainEntitledTestRunner */;
                        targetProxy = D45D8F812224DBE300D6C124 /* PBXContainerItemProxy */;
                };
-               D45D8F842224DBEF00D6C124 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6C9808681E788AFD00E70590 /* CKKSCloudKitTests_ios */;
-                       targetProxy = D45D8F832224DBEF00D6C124 /* PBXContainerItemProxy */;
-               };
                D45D8F862224DBF800D6C124 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
                D45D8F862224DBF800D6C124 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
@@ -37516,11 +37858,6 @@
                        target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
                        targetProxy = D477EE8021ED48DF00C9AAFF /* PBXContainerItemProxy */;
                };
                        target = BEF88C2F1EAFFC3F00357577 /* TrustedPeersTests */;
                        targetProxy = D477EE8021ED48DF00C9AAFF /* PBXContainerItemProxy */;
                };
-               D477EE8321ED48E800C9AAFF /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 478D426C1FD72A8100CAB645 /* secdxctests_mac */;
-                       targetProxy = D477EE8221ED48E800C9AAFF /* PBXContainerItemProxy */;
-               };
                D4794E6B21222E72007C6725 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
                D4794E6B21222E72007C6725 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
@@ -37551,16 +37888,6 @@
                        target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
                        targetProxy = D4A763D82224BD990063B2B9 /* PBXContainerItemProxy */;
                };
                        target = DC3502B41E0208BE00BC0587 /* CKKSTests */;
                        targetProxy = D4A763D82224BD990063B2B9 /* PBXContainerItemProxy */;
                };
-               D4A763DB2224BDAB0063B2B9 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6C98082C1E788AEB00E70590 /* CKKSCloudKitTests_mac */;
-                       targetProxy = D4A763DA2224BDAB0063B2B9 /* PBXContainerItemProxy */;
-               };
-               D4A763DD2224BDCC0063B2B9 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6CF4A0B31E45488B00ECD7B5 /* KeychainEntitledTestApp_mac */;
-                       targetProxy = D4A763DC2224BDCC0063B2B9 /* PBXContainerItemProxy */;
-               };
                D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
                D4A763DF2224BDDC0063B2B9 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EB9C1DAE1BDFD4DE00F89272 /* SecurityBatsTests */;
@@ -37756,16 +38083,6 @@
                        target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
                        targetProxy = D4E0E9732224DE8200A802E0 /* PBXContainerItemProxy */;
                };
                        target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
                        targetProxy = D4E0E9732224DE8200A802E0 /* PBXContainerItemProxy */;
                };
-               D4E0E9762224DE9100A802E0 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = D4E0E9752224DE9100A802E0 /* PBXContainerItemProxy */;
-               };
-               D4E0E97A2224DEE600A802E0 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 6CF4A0DF1E4549F200ECD7B5 /* KeychainEntitledTestApp_ios */;
-                       targetProxy = D4E0E9792224DEE600A802E0 /* PBXContainerItemProxy */;
-               };
                D4E0E97C2224DF0300A802E0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
                D4E0E97C2224DF0300A802E0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
@@ -37881,11 +38198,6 @@
                        target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
                        targetProxy = D4E0E9A92224DFDD00A802E0 /* PBXContainerItemProxy */;
                };
                        target = 47702B2D1E5F492C00B29577 /* seckeychainnetworkextensionunauthorizedaccesstest */;
                        targetProxy = D4E0E9A92224DFDD00A802E0 /* PBXContainerItemProxy */;
                };
-               D4E0E9AC2224DFEB00A802E0 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 4727FBB61F9918580003AE36 /* secdxctests_ios */;
-                       targetProxy = D4E0E9AB2224DFEB00A802E0 /* PBXContainerItemProxy */;
-               };
                D4E0E9AE2224E00600A802E0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
                D4E0E9AE2224E00600A802E0 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 4CB740A20A47567C00D641BB /* securitytool_ios */;
@@ -38481,21 +38793,6 @@
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                        targetProxy = DC311E662124A9D2002F5EAE /* PBXContainerItemProxy */;
                };
                        target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
                        targetProxy = DC311E662124A9D2002F5EAE /* PBXContainerItemProxy */;
                };
-               DC34CD2D20326C2C00302481 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = DC34CD2C20326C2C00302481 /* PBXContainerItemProxy */;
-               };
-               DC34CD3420326C3100302481 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = DC34CD3320326C3100302481 /* PBXContainerItemProxy */;
-               };
-               DC34CD3620326C3B00302481 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC0BCC211D8C684F00070CB0 /* utilities */;
-                       targetProxy = DC34CD3520326C3B00302481 /* PBXContainerItemProxy */;
-               };
                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
                DC3502C41E020D4D00BC0587 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
@@ -38846,11 +39143,6 @@
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
                        targetProxy = DC69A5822165295F00512BD6 /* PBXContainerItemProxy */;
                };
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
                        targetProxy = DC69A5822165295F00512BD6 /* PBXContainerItemProxy */;
                };
-               DC69A5872165298500512BD6 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
-                       targetProxy = DC69A5862165298500512BD6 /* PBXContainerItemProxy */;
-               };
                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */;
                DC6BC2741D90D07800DD57B3 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC6BC26C1D90CFEF00DD57B3 /* securityd_macos_startup */;
@@ -38926,16 +39218,6 @@
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
                        targetProxy = DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */;
                };
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
                        targetProxy = DC89998A1E410DBF00E6E604 /* PBXContainerItemProxy */;
                };
-               DC93C4C9214713DC008F8362 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = DC93C4C8214713DC008F8362 /* PBXContainerItemProxy */;
-               };
-               DC93C4CD21471401008F8362 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52E7731D80BC8000B0A59C /* libsecurityd_ios */;
-                       targetProxy = DC93C4CC21471401008F8362 /* PBXContainerItemProxy */;
-               };
                DC99B85C20EACA470065B73B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
                DC99B85C20EACA470065B73B /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DC8834011D8A218F00CE0ACA /* ASN1 */;
@@ -39186,16 +39468,6 @@
                        target = DCD66DC41D8205C400DB1393 /* SecOtrOSX */;
                        targetProxy = DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */;
                };
                        target = DCD66DC41D8205C400DB1393 /* SecOtrOSX */;
                        targetProxy = DCD66DE51D82061F00DB1393 /* PBXContainerItemProxy */;
                };
-               DCD6BF5421E919610015F7A8 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
-                       targetProxy = DCD6BF5321E919610015F7A8 /* PBXContainerItemProxy */;
-               };
-               DCD6BF5621E9196E0015F7A8 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
-                       targetProxy = DCD6BF5521E9196E0015F7A8 /* PBXContainerItemProxy */;
-               };
                DCD6BF5821E919820015F7A8 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
                DCD6BF5821E919820015F7A8 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
@@ -39291,6 +39563,11 @@
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
                        targetProxy = DCDA5E632124BCA9009B11B2 /* PBXContainerItemProxy */;
                };
                        target = DCDA5E4F2124B9C5009B11B2 /* aks_support */;
                        targetProxy = DCDA5E632124BCA9009B11B2 /* PBXContainerItemProxy */;
                };
+               DCE27861245B81BD00381FE8 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = 4771D971209A755800BA9772 /* KeychainDataclassOwner */;
+                       targetProxy = DCE27860245B81BD00381FE8 /* PBXContainerItemProxy */;
+               };
                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCE4E8931D7F34F600AFB96E /* authd */;
                DCE4E8D81D7F37F200AFB96E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = DCE4E8931D7F34F600AFB96E /* authd */;
@@ -39601,16 +39878,6 @@
                        target = DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */;
                        targetProxy = EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */;
                };
                        target = DC0BC5501D8B6D2D00070CB0 /* XPCKeychainSandboxCheck */;
                        targetProxy = EBD31B411E0A18A600FBE9FA /* PBXContainerItemProxy */;
                };
-               EBD7DF8121FF475B0089F2DF /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DC52E8BE1D80C25800B0A59C /* SecureObjectSyncServer */;
-                       targetProxy = EBD7DF8021FF475B0089F2DF /* PBXContainerItemProxy */;
-               };
-               EBD7DF8321FF475B0089F2DF /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = DCD8A1061E09EE0F00E4FA0A /* SecureObjectSyncFramework */;
-                       targetProxy = EBD7DF8221FF475B0089F2DF /* PBXContainerItemProxy */;
-               };
                EBF374821DC058B60065D840 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;
                EBF374821DC058B60065D840 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = EBF374711DC055580065D840 /* security-sysdiagnose */;
@@ -39842,6 +40109,7 @@
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
@@ -39877,6 +40145,7 @@
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = secdtests;
                                STRIP_STYLE = debugging;
@@ -40121,16 +40390,15 @@
                                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/otctl/otctl-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/otctl/otctl-Entitlements.plist";
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = YES;
                                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;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
@@ -40141,56 +40409,63 @@
                                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/otctl/otctl-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/otctl/otctl-Entitlements.plist";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /usr/sbin;
                                MTL_ENABLE_DEBUG_INFO = 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;
                };
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
                };
-               0C9AEEB520783FBB00BF6237 /* Debug */ = {
+               0CA378E423876DD100090B7E /* 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 = "$(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",
                                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";
+                               INFOPLIST_FILE = "keychain/OctagonTrust/ot-tests/OctagonTrustTests-Info.plist";
                                INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
-                                       "@executable_path/Frameworks",
-                                       "@loader_path/Frameworks",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
                                );
                                );
-                               "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "@executable_path/../Frameworks",
-                                       "@loader_path/../Frameworks",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
                                );
                                );
-                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                               LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "@executable_path/../Frameworks",
-                                       "@loader_path/../Frameworks",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                );
-                               MTL_ENABLE_DEBUG_INFO = YES;
                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
@@ -40198,90 +40473,61 @@
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
                                        "$(OTHER_LDFLAGS_APPLESYSTEMINFO)",
                                        "$(OTHER_LDFLAGS_APS)",
                                        "$(OTHER_LDFLAGS_CLOUDKIT)",
-                                       "$(OTHER_LDFLAGS_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_CORECDP)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "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_PREQUELITE)",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
-                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
                                        "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CLOUDSERVICES)",
                                );
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
+                               OTHER_SWIFT_FLAGS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTrustTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
+                               SKIP_INSTALL = NO;
+                               SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
+                               SWIFT_OBJC_BRIDGING_HEADER = "";
+                               SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = "";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
-               0C9AEEB620783FBB00BF6237 /* Release */ = {
+               0CCC227823F357EE00E1FCD0 /* Release */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
+                       baseConfigurationReference = 725D438D212CAA3B007B49E4 /* xcconfig/swift_binary_shim.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 = "";
+                               FRAMEWORK_SEARCH_PATHS = (
+                                       "$(inherited)",
+                                       "$(SDKROOT)/../../AppleInternal/Library/Frameworks",
+                               );
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "NO_SERVER=1",
+                                       "NDEBUG=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";
+                               INFOPLIST_FILE = "keychain/OctagonTrust/ot-tests/OctagonTrustTests-Info.plist";
                                INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
-                                       "@executable_path/Frameworks",
-                                       "@loader_path/Frameworks",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Frameworks,
                                );
                                );
-                               "LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "@executable_path/../Frameworks",
-                                       "@loader_path/../Frameworks",
+                                       /AppleInternal/CoreOS/BATS/unit_tests/Frameworks/OCMockUmbrella.framework/Versions/A/Frameworks,
                                );
                                );
-                               "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = (
+                               LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "@executable_path/../Frameworks",
-                                       "@loader_path/../Frameworks",
+                                       "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                );
-                               MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_LDFLAGS = (
                                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_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_CORECDP)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
@@ -40294,177 +40540,114 @@
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
                                        "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
                                        "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
                                        "-ObjC",
-                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
+                                       "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
+                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
                                        "$(OTHER_LDFLAGS_ACCOUNTS)",
+                                       "-framework",
+                                       Security,
+                                       "$(OTHER_LDFLAGS_UserManagement)",
+                                       "$(OTHER_LDFLAGS_CLOUDSERVICES)",
                                );
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
-               0CA378E423876DD100090B7E /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                       };
-                       name = Debug;
-               };
-               0CA378E523876DD100090B7E /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
+                               OTHER_SWIFT_FLAGS = "";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.OctagonTrustTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
+                               SKIP_INSTALL = NO;
+                               SWIFT_OBJC_BRIDGING_HEADER = "";
+                               SWIFT_OBJC_INTERFACE_HEADER_NAME = "";
+                               SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = "";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               0CF4064E2072E3E3003D6A7F /* Debug */ = {
+               0CD743AC23C3EC8000FA0EC5 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                CLANG_ANALYZER_NONNULL = 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_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_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
+                               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;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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;
+                               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 = (
-                                       "$(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[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_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
                                );
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
+                               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;
                };
                        };
                        name = Debug;
                };
-               0CF4064F2072E3E3003D6A7F /* Release */ = {
+               0CD743AD23C3EC8000FA0EC5 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                CLANG_ANALYZER_NONNULL = 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_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_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "$(inherited)",
-                               );
+                               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;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = "keychain/Signin Metrics/Resources/SFTMTests-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",
-                               );
+                               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_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
                                OTHER_LDFLAGS = (
                                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_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "-ObjC",
-                                       "$(OTHER_LDFLAGS_CORECDP)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                               );
-                               "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_UPWARD_PROTOCOLBUFFER)",
+                                       "$(OTHER_LDFLAGS_UPWARD_FOUNDATION)",
                                );
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.SFTMTests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               USE_XCTRUNNER = YES;
+                               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;
                                VALIDATE_PRODUCT = YES;
+                               VERSIONING_SYSTEM = "apple-generic";
+                               VERSION_INFO_PREFIX = "";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -40483,7 +40666,6 @@
                                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;
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
                                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;
@@ -40508,9 +40690,7 @@
                                        "-Wglobal-constructors",
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wglobal-constructors",
                                        "-Wmost",
                                        "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
                                );
                        };
                        name = Debug;
                                );
                        };
                        name = Debug;
@@ -40530,7 +40710,6 @@
                                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;
-                               GCC_C_LANGUAGE_STANDARD = gnu11;
                                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;
@@ -40555,9 +40734,7 @@
                                        "-Wglobal-constructors",
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wglobal-constructors",
                                        "-Wmost",
                                        "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
                                        "$(inherited)",
                                        "$(inherited)",
-                                       "-Wno-error=c++11-narrowing",
                                );
                        };
                        name = Release;
                                );
                        };
                        name = Release;
@@ -40807,6 +40984,74 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
+               3E88360F24F068EF00E9F4D6 /* Debug */ = {
+                       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)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                       };
+                       name = Debug;
+               };
+               3E88361024F068EF00E9F4D6 /* Release */ = {
+                       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)";
+                               SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
+                               VALIDATE_PRODUCT = YES;
+                       };
+                       name = Release;
+               };
                438169101B4EDCBD00C54D58 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                438169101B4EDCBD00C54D58 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -40837,13 +41082,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;
                                CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                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_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;
@@ -40859,14 +41102,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 = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
                                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 = RegressionTests/seckeychainnetworkextensionstest/seckeychainnetworkextensionstest.entitlements;
                                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;
@@ -40924,10 +41165,7 @@
                                );
                                PRODUCT_NAME = securityd;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = securityd;
                                STRIP_STYLE = debugging;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -40980,10 +41218,7 @@
                                );
                                PRODUCT_NAME = securityd;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = securityd;
                                STRIP_STYLE = debugging;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -41043,7 +41278,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
@@ -41076,6 +41310,11 @@
                                        "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
                                        "$(OTHER_LDFLAGS_UserManagement)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(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)",
                                );
                                        "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
@@ -41091,7 +41330,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
@@ -41124,6 +41362,11 @@
                                        "$(OTHER_LDFLAGS_AKS_ACL_LIBRARY)",
                                        "$(OTHER_LDFLAGS_UserManagement)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(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)",
                                );
                                        "$(OTHER_LDFLAGS_CORECDP)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
@@ -41140,13 +41383,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;
                                CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                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;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
@@ -41162,14 +41403,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 = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
                                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 = RegressionTests/seckeychainnetworkextensionsystemdaemontest/seckeychainnetworkextensionsystemdaemontest.entitlements;
                                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;
@@ -41184,13 +41423,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;
                                CODE_SIGN_ENTITLEMENTS = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                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_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;
@@ -41206,14 +41443,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 = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
                                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 = RegressionTests/seckeychainnetworkextensionunauthorizedaccesstest/seckeychainnetworkextensionunauthorizedaccesstest.entitlements;
                                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;
@@ -41225,33 +41460,20 @@
                4771D976209A755800BA9772 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                4771D976209A755800BA9772 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
                                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_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                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_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_STYLE = Automatic;
-                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               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";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                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)";
-                               SDKROOT = iphoneos.internal;
-                               TARGETED_DEVICE_FAMILY = "1,2";
+                               TARGETED_DEVICE_FAMILY = "1,2,6";
                                WRAPPER_EXTENSION = bundle;
                        };
                        name = Debug;
                                WRAPPER_EXTENSION = bundle;
                        };
                        name = Debug;
@@ -41259,23 +41481,13 @@
                4771D977209A755800BA9772 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                4771D977209A755800BA9772 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
                                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_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                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_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                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;
                                INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INFOPLIST_FILE = keychain/KeychainDataclassOwner/Info.plist;
@@ -41283,113 +41495,18 @@
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.KeychainDataclassOwner;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               SDKROOT = iphoneos.internal;
-                               TARGETED_DEVICE_FAMILY = "1,2";
+                               TARGETED_DEVICE_FAMILY = "1,2,6";
                                VALIDATE_PRODUCT = YES;
                                WRAPPER_EXTENSION = bundle;
                        };
                        name = Release;
                };
                                VALIDATE_PRODUCT = YES;
                                WRAPPER_EXTENSION = bundle;
                        };
                        name = Release;
                };
-               478D429A1FD72A8100CAB645 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-                               CLANG_WARN_COMMA = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_STRICT_PROTOTYPES = NO;
-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
-                               CODE_SIGN_STYLE = Automatic;
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               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_FOR_SECURITYD)",
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TARGETED_DEVICE_FAMILY = "1,2";
-                       };
-                       name = Debug;
-               };
-               478D429B1FD72A8100CAB645 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ALWAYS_SEARCH_USER_PATHS = NO;
-                               CLANG_ANALYZER_NONNULL = YES;
-                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-                               CLANG_ENABLE_MODULES = NO;
-                               CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-                               CLANG_WARN_COMMA = YES;
-                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-                               CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-                               CLANG_WARN_STRICT_PROTOTYPES = NO;
-                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-                               CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_ENTITLEMENTS = "secdtests/secdtests-entitlements.plist";
-                               CODE_SIGN_IDENTITY = "-";
-                               CODE_SIGN_STYLE = Automatic;
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               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_FOR_SECURITYD)",
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdxctests;
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TARGETED_DEVICE_FAMILY = "1,2";
-                               VALIDATE_PRODUCT = YES;
-                       };
-                       name = Release;
-               };
                47C2F1882059CB690062DE30 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                47C2F1882059CB690062DE30 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -41422,7 +41539,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -41455,7 +41571,6 @@
                                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++14";
                                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;
@@ -41488,7 +41603,6 @@
                                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++14";
                                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;
@@ -41519,7 +41633,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;
@@ -41530,7 +41643,6 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CODE_SIGN_ENTITLEMENTS = CircleJoinRequested/entitlements.plist;
                                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",
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
@@ -41573,7 +41685,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;
@@ -41585,7 +41696,6 @@
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                CODE_SIGN_ENTITLEMENTS = CircleJoinRequested/entitlements.plist;
                                ENABLE_NS_ASSERTIONS = NO;
                                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)",
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                HEADER_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -41661,6 +41771,7 @@
                                        "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(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;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = SecurityDevTests;
@@ -41703,6 +41814,7 @@
                                        "$(OTHER_LDFLAGS_SECUREKEYVAULT)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(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;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.${PRODUCT_NAME:identifier}";
                                PRODUCT_NAME = SecurityDevTests;
@@ -41769,7 +41881,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -41782,7 +41893,6 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                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_DYNAMIC_NO_PIC = NO;
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -41814,7 +41924,6 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCE4E82B1D7A54D300AFB96E /* ios_on_macos.xcconfig */;
                        buildSettings = {
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -41827,7 +41936,6 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                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 = (
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = "";
                                HEADER_SEARCH_PATHS = (
@@ -41855,7 +41963,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_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
@@ -41868,7 +41975,6 @@
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = 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";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";
@@ -41893,7 +41999,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_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_ARC = YES;
@@ -41907,7 +42012,6 @@
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                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;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "KeychainSyncAccountNotification/KeychainSyncAccountNotification-Prefix.pch";
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -41928,12 +42032,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 = "experiment/tool/experimentTool-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 = "experiment/tool/experimentTool-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;
@@ -41948,14 +42050,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 = "experiment/tool/experimentTool-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 = "experiment/tool/experimentTool-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;
@@ -41967,7 +42067,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;
@@ -41981,7 +42080,6 @@
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = 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_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "DEBUG=1",
@@ -42005,7 +42103,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;
@@ -42020,7 +42117,6 @@
                                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;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
                                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;
@@ -42108,7 +42204,7 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               6C39237721F13E4D00D018AD /* Debug */ = {
+               6C2045EF2424BA7F00F9461D /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
@@ -42116,6 +42212,66 @@
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ENABLE_MODULES = NO;
                                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_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+                               CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+                               CLANG_WARN_UNREACHABLE_CODE = 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;
+                               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)";
+                               SDKROOT = macosx.internal;
+                       };
+                       name = Debug;
+               };
+               6C2045F02424BA7F00F9461D /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+                               CLANG_ENABLE_MODULES = NO;
+                               CLANG_ENABLE_OBJC_WEAK = YES;
+                               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;
+                               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;
+                               INFOPLIST_FILE = "$(SRCROOT)/keychain/KeychainStasher/KeychainStasher-Info.plist";
+                               INSTALL_PATH = /usr/libexec;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainStasher;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               SDKROOT = macosx.internal;
+                       };
+                       name = Release;
+               };
+               6C39237721F13E4D00D018AD /* 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_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;
@@ -42125,11 +42281,8 @@
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_ENTITLEMENTS = tests/SecDbBackupTests/Entitlements.plist;
-                               CODE_SIGN_IDENTITY = "-";
-                               CODE_SIGN_STYLE = Manual;
+                               CODE_SIGN_ENTITLEMENTS = "tests/SecDbBackupTests/SecDbBackupTests-Entitlements.plist";
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               DEVELOPMENT_TEAM = "";
                                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;
@@ -42157,8 +42310,8 @@
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               PROVISIONING_PROFILE_SPECIFIER = "";
-                               USES_XCTRUNNER = YES;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -42168,7 +42321,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
                                CLANG_WARN_COMMA = YES;
@@ -42179,11 +42331,8 @@
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
                                CLANG_WARN_STRICT_PROTOTYPES = NO;
                                CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
                                CLANG_WARN_UNREACHABLE_CODE = YES;
-                               CODE_SIGN_ENTITLEMENTS = tests/SecDbBackupTests/Entitlements.plist;
-                               CODE_SIGN_IDENTITY = "-";
-                               CODE_SIGN_STYLE = Manual;
+                               CODE_SIGN_ENTITLEMENTS = "tests/SecDbBackupTests/SecDbBackupTests-Entitlements.plist";
                                COPY_PHASE_STRIP = NO;
                                COPY_PHASE_STRIP = NO;
-                               DEVELOPMENT_TEAM = "";
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
@@ -42211,8 +42360,8 @@
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.secdbbackuptests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               PROVISIONING_PROFILE_SPECIFIER = "";
-                               USES_XCTRUNNER = YES;
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
@@ -42225,7 +42374,6 @@
                                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_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
@@ -42263,7 +42411,6 @@
                                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_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                INFOPLIST_FILE = "$(SRCROOT)/supd/Tests/Info.plist";
@@ -42294,264 +42441,120 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               6C98085F1E788AEB00E70590 /* Debug */ = {
+               6C7BE2E523C3DD64003BB2CA /* 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 = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               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_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
-                               LD_RUNPATH_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "@executable_path/Frameworks",
-                                       "@loader_path/Frameworks",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = YES;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
                                        "$(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)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_AKS_LIBRARY)",
                                        "$(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)",
-                                       "-framework",
-                                       CrashReporterSupport,
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                );
                                );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_mac.app/Contents/MacOS/KeychainEntitledTestApp_mac";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
-               6C9808601E788AEB00E70590 /* Release */ = {
+               6C7BE2E623C3DD64003BB2CA /* 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 = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
-                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               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_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
-                               LD_RUNPATH_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "@executable_path/Frameworks",
-                                       "@loader_path/Frameworks",
-                               );
-                               MTL_ENABLE_DEBUG_INFO = NO;
+                               GCC_WARN_SHADOW = NO;
+                               INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
                                OTHER_LDFLAGS = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
-                                       "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
+                                       "-lsqlite3",
+                                       "-framework",
+                                       CFNetwork,
+                                       "-framework",
+                                       IOKit,
+                                       "$(OTHER_LDFLAGS_ACM_LIBRARY)",
                                        "$(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)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               "OTHER_LDFLAGS[sdk=iphoneos*]" = (
+                                       "$(OTHER_LDFLAGS_SECURITYFOUNDATION)",
                                        "$(OTHER_LDFLAGS_AKS_LIBRARY)",
                                        "$(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)",
-                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
+                                       "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                );
                                );
-                               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_NAME = "$(TARGET_NAME)";
+                               REEXPORTED_LIBRARY_PATHS = "";
+                               STRIP_STYLE = debugging;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               6C98089B1E788AFD00E70590 /* Debug */ = {
+               6C963285242A279B00C53CE2 /* 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++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_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/stashtester/stashtester.entitlements";
+                               CODE_SIGN_STYLE = Manual;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               DEVELOPMENT_TEAM = "";
+                               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_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
-                               LD_RUNPATH_SEARCH_PATHS = (
-                                       "$(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_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               "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)",
-                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_ios.app/KeychainEntitledTestApp_ios";
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;
+                               MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PROVISIONING_PROFILE_SPECIFIER = "";
+                               SDKROOT = macosx.internal;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
-               6C98089C1E788AFD00E70590 /* Release */ = {
+               6C963286242A279B00C53CE2 /* 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++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_IDENTITY = "";
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "NO_SERVER=1",
-                                       "NO_LIBTRUSTD=1",
-                                       "$(inherited)",
-                               );
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/stashtester/stashtester.entitlements";
+                               CODE_SIGN_STYLE = Manual;
+                               DEVELOPMENT_TEAM = "";
+                               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_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = keychain/ckks/tests/CKKSCloudKitTestsInfo.plist;
-                               INSTALL_PATH = "$(SECURITY_XCTEST_DIRECTORY)";
-                               LD_RUNPATH_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "@executable_path/Frameworks",
-                                       "@loader_path/Frameworks",
-                               );
+                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               MACOSX_DEPLOYMENT_TARGET = 10.16;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                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_PREQUELITE)",
-                                       "$(OTHER_LDFLAGS_WIRELESSDIAGNOSTICS)",
-                                       "$(OTHER_LDFLAGS_SHAREDWEBCREDENTIALS)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               "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)",
-                                       "$(OTHER_LDFLAGS_CrashReporterSupport)",
-                                       "$(OTHER_LDFLAGS_IMCORE)",
-                                       "$(OTHER_LDFLAGS_ACCOUNTS)",
-                                       "$(OTHER_LDFLAGS_UserManagement)",
-                                       "$(OTHER_LDFLAGS_FOR_SECURITYD)",
-                               );
-                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.CKKSCloudKitTests;
-                               PRODUCT_NAME = CKKSCloudKitTests;
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KeychainEntitledTestApp_ios.app/KeychainEntitledTestApp_ios";
-                               VALIDATE_PRODUCT = YES;
+                               MTL_FAST_MATH = YES;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PROVISIONING_PROFILE_SPECIFIER = "";
+                               SDKROOT = macosx.internal;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -42561,7 +42564,6 @@
                                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++14";
                                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;
@@ -42586,7 +42588,6 @@
                                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++14";
                                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;
@@ -42612,7 +42613,6 @@
                                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++14";
                                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;
@@ -42647,7 +42647,6 @@
                                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++14";
                                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;
@@ -42683,29 +42682,23 @@
                                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;
                                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";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";
                                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;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";
                                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,
                                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,
+                                       /AppleInternal/Developer/Library/Frameworks,
                                );
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -42715,29 +42708,23 @@
                                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;
                                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";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PLATFORM_DIR)/Developer/Library/Frameworks",
-                                       "$(PLATFORM_DIR)/Developer/AppleInternal/Library/Frameworks",
-                               );
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";
                                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,
                                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,
+                                       /AppleInternal/Developer/Library/Frameworks,
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -42748,26 +42735,26 @@
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                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";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               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;
-                               INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               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;
                                OTHER_CODE_SIGN_FLAGS = "--deep";
                                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";
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_AppFrameworks)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainEntitledTestApp;
                                PRODUCT_NAME = KeychainEntitledTestApp;
                        };
                        name = Debug;
                                PRODUCT_NAME = KeychainEntitledTestApp;
                        };
                        name = Debug;
@@ -42779,92 +42766,28 @@
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                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";
+                               CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/tests/TestHostBinaries/KeychainEntitledTestRunner.entitlements";
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               INFOPLIST_FILE = KeychainEntitledTestApp_mac/Info.plist;
-                               INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
+                               INSTALL_PATH = /AppleInternal/Applications;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_CODE_SIGN_FLAGS = "--deep";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-mac";
+                               OTHER_LDFLAGS = "$(OTHER_LDFLAGS_AppFrameworks)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.apple.security.KeychainEntitledTestApp;
                                PRODUCT_NAME = KeychainEntitledTestApp;
                        };
                        name = Release;
                };
                                PRODUCT_NAME = KeychainEntitledTestApp;
                        };
                        name = Release;
                };
-               6CF4A0F51E4549F300ECD7B5 /* Debug */ = {
-                       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_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 = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               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;
-                       };
-                       name = Debug;
-               };
-               6CF4A0F61E4549F300ECD7B5 /* Release */ = {
-                       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_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 = "$(SRCROOT)/keychain/ckks/tests/testrunner/KeychainEntitledTestRunner-Entitlements.plist";
-                               COPY_PHASE_STRIP = NO;
-                               ENABLE_NS_ASSERTIONS = NO;
-                               GCC_C_LANGUAGE_STANDARD = gnu99;
-                               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 = NO;
-                               OTHER_CODE_SIGN_FLAGS = "--deep";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.apple.security.KeychainEntitledTestApp-ios";
-                               PRODUCT_NAME = KeychainEntitledTestApp;
-                               VALIDATE_PRODUCT = NO;
-                       };
-                       name = Release;
-               };
                7913B20D0D172B3900601FE9 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                7913B20D0D172B3900601FE9 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -42920,6 +42843,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;
                        buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEAD_CODE_STRIPPING = YES;
                                DEFINES_MODULE = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEAD_CODE_STRIPPING = YES;
                                DEFINES_MODULE = YES;
@@ -42951,6 +42875,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = DCC1849220EEEC4400F3B26C /* security_framework.xcconfig */;
                        buildSettings = {
+                               CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEAD_CODE_STRIPPING = YES;
                                DEFINES_MODULE = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                DEAD_CODE_STRIPPING = YES;
                                DEFINES_MODULE = YES;
@@ -43123,10 +43048,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = NO;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -43174,10 +43096,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = NO;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = NO;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -43201,7 +43120,6 @@
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = YES;
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_STATIC_ANALYZER_MODE = shallow;
@@ -43210,7 +43128,7 @@
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                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;
@@ -43219,6 +43137,7 @@
                                CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = 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_RANGE_LOOP_ANALYSIS = YES;
                                CLANG_WARN_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -43232,7 +43151,6 @@
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                ENABLE_TESTABILITY = YES;
                                EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
                                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 = (
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -43240,7 +43158,7 @@
                                        "$(inherited)",
                                );
                                GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
                                        "$(inherited)",
                                );
                                GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_WARNINGS_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_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -43262,9 +43180,10 @@
                                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";
                                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;
+                               LLVM_LTO = YES;
                                ONLY_ACTIVE_ARCH = YES;
                                OTHER_LDFLAGS = "";
                                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";
                                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";
@@ -43273,7 +43192,7 @@
                                SERVICETYPE_USER_OR_SYSTEM = System;
                                "SERVICETYPE_USER_OR_SYSTEM[sdk=macosx*]" = User;
                                STRIP_INSTALLED_PRODUCT = NO;
                                SERVICETYPE_USER_OR_SYSTEM = System;
                                "SERVICETYPE_USER_OR_SYSTEM[sdk=macosx*]" = User;
                                STRIP_INSTALLED_PRODUCT = NO;
-                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos watchos macosx appletvos appletvsimulator watchsimulator";
+                               SUPPORTED_PLATFORMS = "bridgeos iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator";
                                SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
                                SUPPORTS_TEXT_BASED_API = YES;
                                Sim_Name = "";
                                "Sim_Name[sdk=embeddedsimulator*][arch=*]" = _sim;
@@ -43288,7 +43207,6 @@
                        buildSettings = {
                                APPLY_RULES_IN_COPY_FILES = YES;
                                CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
                        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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_STATIC_ANALYZER_MODE = shallow;
@@ -43297,7 +43215,7 @@
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
                                CLANG_WARN_COMMA = YES;
                                CLANG_WARN_CONSTANT_CONVERSION = YES;
                                CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
                                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;
@@ -43306,6 +43224,7 @@
                                CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
                                CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
                                CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = 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_RANGE_LOOP_ANALYSIS = YES;
                                CLANG_WARN_STRICT_PROTOTYPES = YES;
                                CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -43318,7 +43237,6 @@
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                EXCLUDED_INSTALLSRC_SUBDIRECTORY_PATTERNS = "$(SRCROOT)/sslViewer/ecc-secp256r1-client.pfx";
                                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 = (
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_OPTIMIZATION_LEVEL = s;
                                GCC_PREPROCESSOR_DEFINITIONS = (
@@ -43326,7 +43244,7 @@
                                        "$(inherited)",
                                );
                                GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
                                        "$(inherited)",
                                );
                                GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-                               GCC_TREAT_WARNINGS_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_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
                                GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
@@ -43350,6 +43268,7 @@
                                "INSTALL_DAEMON_AGENT_DIR[sdk=macosx*]" = "$(SYSTEM_LIBRARY_DIR)/LaunchAgents";
                                LLVM_LTO = YES;
                                OTHER_LDFLAGS = "";
                                "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";
                                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";
@@ -43357,7 +43276,7 @@
                                "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;
                                "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 = "iphonesimulator iphoneos watchos macosx appletvos appletvsimulator watchsimulator";
+                               SUPPORTED_PLATFORMS = "bridgeos iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator";
                                SUPPORTS_TEXT_BASED_API = YES;
                                SWIFT_COMPILATION_MODE = wholemodule;
                                Sim_Name = "";
                                SUPPORTS_TEXT_BASED_API = YES;
                                SWIFT_COMPILATION_MODE = wholemodule;
                                Sim_Name = "";
@@ -43372,9 +43291,7 @@
                        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_SUSPICIOUS_MOVES = YES;
                                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)",
@@ -43390,9 +43307,7 @@
                        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_SUSPICIOUS_MOVES = YES;
                                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)",
@@ -43411,7 +43326,6 @@
                                ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
                                AXLE_ENABLE_DEBUG_INFO = YES;
                                CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_ASSIGN_ENUM = YES;
@@ -43426,7 +43340,6 @@
                                CODE_SIGN_ENTITLEMENTS = "$(TARGET_NAME)/entitlements.plist";
                                "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";
                                COMBINE_HIDPI_IMAGES = 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_DYNAMIC_NO_PIC = NO;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";
@@ -43435,7 +43348,7 @@
                                        "$(inherited)",
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                        "$(inherited)",
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = 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;
@@ -43460,7 +43373,6 @@
                                ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
                                AXLE_ENABLE_DEBUG_INFO = NO;
                                CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
                                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_CXX_LIBRARY = "libc++";
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_ASSIGN_ENUM = YES;
@@ -43476,10 +43388,9 @@
                                "CODE_SIGN_IDENTITY[sdk=embedded*]" = "-";
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_NS_ASSERTIONS = NO;
                                "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_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = "$(TARGET_NAME)/$(TARGET_NAME)-Prefix.pch";
-                               GCC_WARN_ABOUT_MISSING_NEWLINE = 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;
@@ -43714,7 +43625,6 @@
                                        "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                OTHER_LDFLAGS = (
                                        "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
@@ -43734,6 +43644,7 @@
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-framework",
                                        Security,
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-framework",
                                        Security,
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
@@ -43765,7 +43676,6 @@
                                        "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                OTHER_LDFLAGS = (
                                        "$(SDKROOT)/usr/local/lib/security_libDER",
                                );
                                OTHER_LDFLAGS = (
-                                       "$(OTHER_LDFLAGS_AKS_LIBRARY)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
                                        "$(OTHER_LDFLAGS_APPLEIDAUTHSUPPORT)",
                                        "$(OTHER_LDFLAGS_PROTOBUF)",
                                        "$(OTHER_LDFLAGS_MOBILEGESTALT)",
@@ -43785,6 +43695,7 @@
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-framework",
                                        Security,
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-framework",
                                        Security,
+                                       "$(OTHER_LDFLAGS_MOCK_AKS_LIBRARY)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustedPeersHelperUnitTests;
                                PRODUCT_NAME = "$(TARGET_NAME)";
@@ -43796,7 +43707,6 @@
                };
                BEF88C391EAFFC4000357577 /* Debug */ = {
                        isa = XCBuildConfiguration;
                };
                BEF88C391EAFFC4000357577 /* Debug */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -43831,7 +43741,6 @@
                };
                BEF88C3A1EAFFC4000357577 /* Release */ = {
                        isa = XCBuildConfiguration;
                };
                BEF88C3A1EAFFC4000357577 /* Release */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = BE8351D41EC0EEDD00ACD5FD /* framework_requiring_modern_objc_runtime.xcconfig */;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -43910,6 +43819,7 @@
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_NAME = trustd;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = trustd;
                                STRIP_STYLE = debugging;
@@ -43935,6 +43845,7 @@
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_NAME = trustd;
                                STRIP_STYLE = debugging;
                                );
                                PRODUCT_NAME = trustd;
                                STRIP_STYLE = debugging;
@@ -44065,6 +43976,7 @@
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
@@ -44105,6 +44017,7 @@
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                OTHER_LDFLAGS = (
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
@@ -44119,7 +44032,6 @@
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -44134,6 +44046,8 @@
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
                                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;
                                );
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
@@ -44151,7 +44065,6 @@
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -44165,6 +44078,8 @@
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/Frameworks",
+                                       /Developer/Library/Frameworks,
+                                       /AppleInternal/Developer/Library/Frameworks,
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
@@ -44181,7 +44096,6 @@
                                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++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -44190,24 +44104,21 @@
                                CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
                                CODE_SIGN_STYLE = Automatic;
                                DEBUG_INFORMATION_FORMAT = dwarf;
                                CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
                                CODE_SIGN_STYLE = Automatic;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PLATFORM_DIR)/Developer/Library/Frameworks",
-                                       "$(PLATFORM_DIR)/Developer/AppleInternal/Library/Frameworks",
-                               );
+                               ENABLE_TESTING_SEARCH_PATHS = YES;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        /Developer/Library/Frameworks,
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
                                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,
+                                       /AppleInternal/Developer/Library/Frameworks,
                                );
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                TARGETED_DEVICE_FAMILY = "1,2";
                                );
                                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;
                };
@@ -44217,7 +44128,6 @@
                                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++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -44226,23 +44136,20 @@
                                CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
                                CODE_SIGN_STYLE = Automatic;
                                ENABLE_NS_ASSERTIONS = NO;
                                CODE_SIGN_ENTITLEMENTS = tests/TrustTests/TestRunners/trusttests_entitlements.plist;
                                CODE_SIGN_STYLE = Automatic;
                                ENABLE_NS_ASSERTIONS = NO;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(PLATFORM_DIR)/Developer/Library/Frameworks",
-                                       "$(PLATFORM_DIR)/Developer/AppleInternal/Library/Frameworks",
-                               );
+                               ENABLE_TESTING_SEARCH_PATHS = YES;
+                               FRAMEWORK_SEARCH_PATHS = "$(inherited)";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
                                INSTALL_PATH = /AppleInternal/CoreOS/tests/Security;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        /Developer/Library/Frameworks,
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INFOPLIST_FILE = tests/TrustTests/TestRunners/Info.plist;
                                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,
+                                       /AppleInternal/Developer/Library/Frameworks,
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                TARGETED_DEVICE_FAMILY = "1,2";
                                );
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                TARGETED_DEVICE_FAMILY = "1,2";
+                               TEST_BUILD_STYLE = _APPLEINTERNAL;
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
                                VALIDATE_PRODUCT = YES;
                        };
                        name = Release;
@@ -44277,6 +44184,7 @@
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_OCMOCK)",
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_OCMOCK)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
@@ -44313,6 +44221,7 @@
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_OCMOCK)",
                                        "$(OTHER_LDFLAGS_MOBILEASSET)",
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_OCMOCK)",
+                                       "$(OTHER_LDFLAGS_MSUDATAACCESSOR)",
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
                                );
                                PRODUCT_BUNDLE_IDENTIFIER = com.apple.TrustTests;
                                PRODUCT_NAME = TrustTests;
@@ -44794,7 +44703,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;
@@ -44810,7 +44718,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 = (
@@ -44832,7 +44739,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;
@@ -44849,7 +44755,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;
@@ -45360,7 +45265,7 @@
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_ANALYZER_NONNULL = 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)";
                        };
@@ -45373,7 +45278,7 @@
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_WARN_SUSPICIOUS_MOVES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_ANALYZER_NONNULL = 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)";
                        };
@@ -45481,7 +45386,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;
@@ -45506,7 +45410,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;
@@ -45542,7 +45445,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",
                                );
                        };
@@ -45561,7 +45463,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",
                                );
                        };
@@ -45572,10 +45473,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)",
@@ -45591,10 +45490,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)",
@@ -45679,7 +45576,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;
@@ -45698,21 +45594,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;
@@ -45731,15 +45623,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;
                };
@@ -45760,14 +45649,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;
@@ -45789,14 +45677,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 = 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;
@@ -46820,7 +46707,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 = "c++98";
                                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;
@@ -46856,7 +46742,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 = "c++98";
                                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;
@@ -46921,10 +46806,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;
                        };
@@ -46965,10 +46847,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;
                        };
@@ -46979,7 +46858,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -46996,7 +46874,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;
@@ -47020,7 +46897,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47038,7 +46914,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;
@@ -47068,6 +46943,8 @@
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(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;
@@ -47092,6 +46969,8 @@
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(OTHER_LDFLAGS_IMCORE)",
                                        "$(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;
@@ -47460,7 +47339,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;
@@ -47481,7 +47359,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;
@@ -47505,7 +47382,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47522,7 +47398,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;
@@ -47546,7 +47421,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47564,7 +47438,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;
@@ -47581,7 +47454,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47598,7 +47470,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;
@@ -47622,7 +47493,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47640,7 +47510,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;
@@ -47657,7 +47526,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47674,7 +47542,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;
@@ -47698,7 +47565,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47716,7 +47582,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;
@@ -47733,7 +47598,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47750,7 +47614,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;
@@ -47774,7 +47637,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47792,7 +47654,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;
@@ -47809,7 +47670,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47826,7 +47686,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;
@@ -47850,7 +47709,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47868,7 +47726,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;
@@ -47885,7 +47742,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47902,7 +47758,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;
@@ -47926,7 +47781,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47944,7 +47798,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;
@@ -47961,7 +47814,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -47978,7 +47830,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;
@@ -48002,7 +47853,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48020,7 +47870,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;
@@ -48037,7 +47886,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48054,7 +47902,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;
@@ -48078,7 +47925,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48096,7 +47942,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;
@@ -48113,7 +47958,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48130,7 +47974,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;
@@ -48154,7 +47997,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48172,7 +48014,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;
@@ -48401,10 +48242,7 @@
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                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;
                };
@@ -48418,10 +48256,7 @@
                                GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                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;
                };
@@ -48638,7 +48473,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 = (
@@ -48650,10 +48485,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;
                };
@@ -48664,7 +48496,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 = (
@@ -48676,10 +48508,7 @@
                                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;
                };
                        };
                        name = Release;
                };
@@ -48702,7 +48531,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48719,7 +48547,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;
@@ -48743,7 +48570,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -48761,7 +48587,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;
@@ -48930,7 +48755,6 @@
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
-                                       "-Wno-deprecated-register",
                                );
                        };
                        name = Debug;
                                );
                        };
                        name = Debug;
@@ -48961,7 +48785,6 @@
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
                                WARNING_CFLAGS = (
                                        "$(inherited)",
                                        "-Wno-sign-compare",
-                                       "-Wno-deprecated-register",
                                );
                        };
                        name = Release;
                                );
                        };
                        name = Release;
@@ -49338,10 +49161,7 @@
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -49392,10 +49212,7 @@
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                );
                                PRODUCT_NAME = "$(TARGET_NAME)";
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -49429,16 +49246,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;
                };
@@ -49473,16 +49288,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;
                };
@@ -49509,7 +49322,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;
@@ -49542,7 +49355,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;
@@ -49732,17 +49545,25 @@
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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;
                                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;
                                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;
                };
                        };
                        name = Debug;
                };
@@ -49751,17 +49572,24 @@
                        buildSettings = {
                                CLANG_ANALYZER_NONNULL = YES;
                                CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
                        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;
                                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;
                                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;
                };
@@ -49770,7 +49598,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -49787,7 +49614,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;
@@ -49811,7 +49637,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -49829,7 +49654,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;
@@ -50011,7 +49835,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_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;
@@ -50021,7 +49844,6 @@
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = 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 = (
@@ -50044,7 +49866,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_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;
@@ -50056,7 +49877,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;
@@ -50098,7 +49918,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50139,7 +49958,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50180,7 +49998,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50214,7 +50031,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50248,7 +50064,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50291,7 +50106,6 @@
                                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++14";
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_ENABLE_MODULES = NO;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -50372,6 +50186,7 @@
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(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)";
@@ -50423,6 +50238,7 @@
                                        "$(OTHER_LDFLAGS_IMG4DECODE)",
                                        "$(OTHER_LDFLAGS_MOBILE_KEYBAG)",
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "$(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)";
@@ -50489,13 +50305,11 @@
                E7B01BF0166594AB000485F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7B01BF0166594AB000485F1 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               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 = (
@@ -50541,13 +50355,11 @@
                E7B01BF1166594AB000485F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                E7B01BF1166594AB000485F1 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               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)",
@@ -50604,7 +50416,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;
@@ -50623,7 +50434,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",
@@ -50649,7 +50459,7 @@
                                TAPI_VERIFY_MODE = ErrorsOnly;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_PREFIX = "";
                                TAPI_VERIFY_MODE = ErrorsOnly;
                                VERSIONING_SYSTEM = "apple-generic";
                                VERSION_INFO_PREFIX = "";
-                               WARNING_CFLAGS = "-Wno-objc-designated-initializers";
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -50657,7 +50467,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;
@@ -50677,7 +50486,6 @@
                                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_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -50706,7 +50514,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;
@@ -50721,7 +50528,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;
@@ -50783,7 +50589,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;
@@ -50800,7 +50605,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;
@@ -50859,7 +50663,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;
@@ -50875,7 +50678,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 = (
@@ -50916,7 +50718,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;
@@ -50933,7 +50734,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;
@@ -50969,7 +50769,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -50986,7 +50785,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;
@@ -51010,7 +50808,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_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
                                CLANG_ENABLE_MODULES = YES;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_BOOL_CONVERSION = YES;
@@ -51028,7 +50825,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;
@@ -51045,7 +50841,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_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;
@@ -51054,7 +50849,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;
@@ -51071,7 +50865,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_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;
@@ -51080,7 +50873,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";
@@ -51096,7 +50888,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;
@@ -51111,7 +50902,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;
@@ -51166,6 +50956,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;
                };
@@ -51174,7 +50965,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;
@@ -51191,7 +50981,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_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_NO_COMMON_BLOCKS = YES;
                                GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -51243,6 +51032,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;
                };
@@ -51252,12 +51042,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;
@@ -51272,14 +51060,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;
@@ -51291,7 +51077,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;
@@ -51306,7 +51091,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 = (
@@ -51346,7 +51130,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;
@@ -51362,7 +51145,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;
@@ -51398,7 +51180,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;
@@ -51414,7 +51195,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 = (
@@ -51455,7 +51235,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;
@@ -51472,7 +51251,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;
@@ -51507,7 +51285,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;
@@ -51523,7 +51300,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 = (
@@ -51563,7 +51339,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;
@@ -51580,7 +51355,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;
@@ -51618,7 +51392,6 @@
                                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++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;
@@ -51666,6 +51439,7 @@
                                        "-framework",
                                        Security,
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-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)";
@@ -51680,7 +51454,6 @@
                                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++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;
@@ -51728,6 +51501,7 @@
                                        "-framework",
                                        Security,
                                        "$(OTHER_LDFLAGS_FOR_SECURITYD)",
                                        "-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)";
@@ -51770,10 +51544,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -51812,10 +51583,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -51839,7 +51607,6 @@
                                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++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -51875,7 +51642,6 @@
                                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++14";
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_WEAK = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -51953,10 +51719,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -51992,10 +51755,7 @@
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
                                REEXPORTED_LIBRARY_NAMES = "";
                                STRIP_STYLE = debugging;
                                USE_HEADERMAP = YES;
-                               WARNING_CFLAGS = (
-                                       "$(inherited)",
-                                       "-Wno-error=modules-ambiguous-internal-linkage",
-                               );
+                               WARNING_CFLAGS = "$(inherited)";
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -52003,7 +51763,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;
@@ -52018,7 +51777,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 = (
@@ -52058,7 +51816,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;
@@ -52074,7 +51831,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;
@@ -52123,7 +51879,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;
@@ -52139,7 +51894,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 = (
@@ -52179,7 +51933,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;
@@ -52196,7 +51949,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;
@@ -52242,12 +51994,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 = "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 = "$(SECURITY_FUZZER_BASE_DIR)";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
@@ -52261,13 +52011,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_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 = "$(SECURITY_FUZZER_BASE_DIR)";
                                MTL_ENABLE_DEBUG_INFO = NO;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                INSTALL_PATH = "$(SECURITY_FUZZER_BASE_DIR)";
                                MTL_ENABLE_DEBUG_INFO = NO;
@@ -52315,7 +52063,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;
@@ -52331,7 +52078,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 = (
@@ -52372,7 +52118,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;
@@ -52389,7 +52134,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;
@@ -52425,14 +52169,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_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_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                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;
@@ -52446,7 +52188,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_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
                                CLANG_ENABLE_OBJC_ARC = YES;
                                CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
                                CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
@@ -52455,7 +52196,6 @@
                                CODE_SIGN_ENTITLEMENTS = "security-sysdiagnose/security-sysdiagnose.entitlements.plist";
                                COPY_PHASE_STRIP = NO;
                                ENABLE_NS_ASSERTIONS = NO;
                                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;
@@ -52468,7 +52208,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 = "c++98";
                                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;
@@ -52504,7 +52243,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 = "c++98";
                                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;
@@ -52540,12 +52278,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;
@@ -52561,13 +52297,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;
@@ -52651,29 +52385,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;
                };
-               0CA378E323876DD100090B7E /* Build configuration list for PBXAggregateTarget "reset_account" */ = {
+               0CCC227623F357EE00E1FCD0 /* Build configuration list for PBXNativeTarget "OctagonTrustTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               0CA378E423876DD100090B7E /* Debug */,
-                               0CA378E523876DD100090B7E /* Release */,
+                               0CCC227723F357EE00E1FCD0 /* Debug */,
+                               0CCC227823F357EE00E1FCD0 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               0CF4064D2072E3E3003D6A7F /* Build configuration list for PBXNativeTarget "SignInAnalyticsTests_ios" */ = {
+               0CD743AB23C3EC8000FA0EC5 /* Build configuration list for PBXNativeTarget "OctagonTrust" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               0CF4064E2072E3E3003D6A7F /* Debug */,
-                               0CF4064F2072E3E3003D6A7F /* Release */,
+                               0CD743AC23C3EC8000FA0EC5 /* Debug */,
+                               0CD743AD23C3EC8000FA0EC5 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
@@ -52714,6 +52448,15 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = 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 = (
@@ -52750,7 +52493,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 */,
@@ -52786,15 +52529,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 = (
@@ -52939,6 +52673,15 @@
                        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 = (
                6C39237621F13E4D00D018AD /* Build configuration list for PBXNativeTarget "SecDbBackupTests" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
@@ -52957,20 +52700,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;
@@ -53002,7 +52745,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 */,
@@ -53011,15 +52754,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 = (
mirror of Security